diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-04-16 22:58:56 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-04-16 22:58:56 +0000 |
| commit | f32f7d8b24d1228df447be85046b9346292d936e (patch) | |
| tree | 4dd81db8332793ee79f181767045cfe2d8b4bc1c | |
| parent | 653d7aeb616d33f78df8df8c1d4e228847594677 (diff) | |
| download | ffmpeg-f32f7d8b24d1228df447be85046b9346292d936e.tar.gz | |
Take ticks per frame into account when warning about difference between
container and codec frame rate.
Originally committed as revision 22895 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | ffmpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3058,7 +3058,7 @@ static void opt_input_file(const char *filename) if(me_threshold) enc->debug |= FF_DEBUG_MV; - if (enc->time_base.den != rfps || enc->time_base.num != rfps_base) { + if (enc->time_base.den != rfps*enc->ticks_per_frame || enc->time_base.num != rfps_base) { if (verbose >= 0) fprintf(stderr,"\nSeems stream %d codec frame rate differs from container frame rate: %2.2f (%d/%d) -> %2.2f (%d/%d)\n", |