From bedf952bb80ae26427854dcde56c139ecb87d4a0 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 30 Nov 2013 10:50:20 +0100 Subject: [PATCH] mpegvideo: move setting encoding-only vars from common_defaults() to encode_defaults() --- libavcodec/mpegvideo.c | 3 --- libavcodec/mpegvideo_enc.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index b11484e4cf..74095affb3 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -788,9 +788,6 @@ void ff_MPV_common_defaults(MpegEncContext *s) s->coded_picture_number = 0; s->picture_number = 0; - s->input_picture_number = 0; - - s->picture_in_gop_number = 0; s->f_code = 1; s->b_code = 1; diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 414be908e5..bacec726f6 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -217,6 +217,9 @@ static void MPV_encode_defaults(MpegEncContext *s) } s->me.mv_penalty = default_mv_penalty; s->fcode_tab = default_fcode_tab; + + s->input_picture_number = 0; + s->picture_in_gop_number = 0; } /* init video encoder */