← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libav/trusty-updates

« back to all changes in this revision

Viewing changes to libavcodec/mpegvideo_enc.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2015-03-16 08:16:54 UTC
  • mfrom: (1.2.24)
  • Revision ID: package-import@ubuntu.com-20150316081654-kmm3occjjy6nndm5
Tags: 6:9.18-0ubuntu0.14.04.1
https://launchpad.net/bugs/1432610
https://launchpad.net/bugs/1370175
* Update to 9.18 to fix multiple security issues (LP: #1432610,
  LP: #1370175)
  - CVE-2013-7020
  - CVE-2014-8542
  - CVE-2014-8543
  - CVE-2014-8544
  - CVE-2014-8547
  - CVE-2014-8548
  - CVE-2014-9604

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/mpegvideo_enc.c
3295
3295
            ff_msmpeg4_encode_picture_header(s, picture_number);
3296
3296
        else if (CONFIG_MPEG4_ENCODER && s->h263_pred)
3297
3297
            ff_mpeg4_encode_picture_header(s, picture_number);
3298
 
        else if (CONFIG_RV10_ENCODER && s->codec_id == AV_CODEC_ID_RV10)
3299
 
            ff_rv10_encode_picture_header(s, picture_number);
 
3298
        else if (CONFIG_RV10_ENCODER && s->codec_id == AV_CODEC_ID_RV10) {
 
3299
            ret = ff_rv10_encode_picture_header(s, picture_number);
 
3300
            if (ret < 0)
 
3301
                return ret;
 
3302
        }
3300
3303
        else if (CONFIG_RV20_ENCODER && s->codec_id == AV_CODEC_ID_RV20)
3301
3304
            ff_rv20_encode_picture_header(s, picture_number);
3302
3305
        else if (CONFIG_FLV_ENCODER && s->codec_id == AV_CODEC_ID_FLV1)