diff options
author | Anton Khirnov <anton@khirnov.net> | 2011-12-24 15:08:07 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2012-01-02 14:15:09 +0100 |
commit | c88d53199b6e98bce0ea1567f4ace5e867020e34 (patch) | |
tree | ac6416ecdb478ad69953c9a0c9df2d40d21ae595 /avconv.c | |
parent | 14165fe1256e0f11ba3d9cf574492ae528e5c9cf (diff) | |
download | ffmpeg-c88d53199b6e98bce0ea1567f4ace5e867020e34.tar.gz |
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.
Diffstat (limited to 'avconv.c')
-rw-r--r-- | avconv.c | 11 |
1 files changed, 1 insertions, 10 deletions
@@ -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) |