diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2015-10-18 11:42:32 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-10-18 11:42:32 +0200 |
commit | b379e1d6dfe2d9bb7b616c63e3240c8458a205d8 (patch) | |
tree | 8533c2b033045095c69dbb82ccc0cbc5a74ecbd7 /libavcodec | |
parent | 002b0499b62e8203ed1d64e12228904c99b950c1 (diff) | |
download | ffmpeg-b379e1d6dfe2d9bb7b616c63e3240c8458a205d8.tar.gz |
avcodec/mpegvideo_enc: Factor new_picture unref out
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/mpegvideo_enc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 1e8d2409af..938546c7cb 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1558,12 +1558,13 @@ static int select_input_picture(MpegEncContext *s) } } no_output_pic: + ff_mpeg_unref_picture(s->avctx, &s->new_picture); + if (s->reordered_input_picture[0]) { s->reordered_input_picture[0]->reference = s->reordered_input_picture[0]->f->pict_type != AV_PICTURE_TYPE_B ? 3 : 0; - ff_mpeg_unref_picture(s->avctx, &s->new_picture); if ((ret = ff_mpeg_ref_picture(s->avctx, &s->new_picture, s->reordered_input_picture[0]))) return ret; @@ -1604,8 +1605,6 @@ no_output_pic: return ret; s->picture_number = s->new_picture.f->display_picture_number; - } else { - ff_mpeg_unref_picture(s->avctx, &s->new_picture); } return 0; } |