Module: libav Branch: master Commit: f0a88d4d2a74534460f4a8b79c448bd5890dbd41
Author: Michael Niedermayer <[email protected]> Committer: Vittorio Giovara <[email protected]> Date: Fri Oct 23 15:23:41 2015 +0200 mpegvideo_enc: Factor new_picture unref out Signed-off-by: Michael Niedermayer <[email protected]> --- libavcodec/mpegvideo_enc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index e5ff3ed..226a24f 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1382,12 +1382,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; @@ -1428,8 +1429,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; } _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
