From c88d53199b6e98bce0ea1567f4ace5e867020e34 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 24 Dec 2011 15:08:07 +0100 Subject: [PATCH] avconv: remove the 'codec framerate is different from stream' warning Codec timebase is not framerate and the situation when it's different from AVStream.r_frame_rate is quite common, nothing to warn about. --- avconv.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/avconv.c b/avconv.c index 159c7b5406..096623e7dc 100644 --- a/avconv.c +++ b/avconv.c @@ -3082,7 +3082,7 @@ static AVCodec *choose_decoder(OptionsContext *o, AVFormatContext *s, AVStream * */ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) { - int i, rfps, rfps_base; + int i; for (i = 0; i < ic->nb_streams; i++) { AVStream *st = ic->streams[i]; @@ -3107,21 +3107,12 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) st->discard = AVDISCARD_ALL; break; case AVMEDIA_TYPE_VIDEO: - rfps = ic->streams[i]->r_frame_rate.num; - rfps_base = ic->streams[i]->r_frame_rate.den; if (dec->lowres) { dec->flags |= CODEC_FLAG_EMU_EDGE; dec->height >>= dec->lowres; dec->width >>= dec->lowres; } - if (dec->time_base.den != rfps * dec->ticks_per_frame || dec->time_base.num != rfps_base) { - - av_log(NULL, AV_LOG_INFO,"\nSeems stream %d codec frame rate differs from container frame rate: %2.2f (%d/%d) -> %2.2f (%d/%d)\n", - i, (float)dec->time_base.den / dec->time_base.num, dec->time_base.den, dec->time_base.num, - (float)rfps / rfps_base, rfps, rfps_base); - } - if (o->video_disable) st->discard = AVDISCARD_ALL; else if (video_discard)