diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2004-12-19 01:23:22 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2004-12-19 01:23:22 +0000 |
commit | 15bc38e57c46a806162fa8899bf9de06db12b7eb (patch) | |
tree | 2d67124accc364b777899369deda48c68f18c090 /ffmpeg.c | |
parent | 0d00cf38c609262239a5f6da5fc7b21016278ec9 (diff) | |
download | ffmpeg-15bc38e57c46a806162fa8899bf9de06db12b7eb.tar.gz |
try to guess the fps if they are variable
Originally committed as revision 3760 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -2881,14 +2881,13 @@ static void opt_input_file(const char *filename) if(me_threshold) enc->debug |= FF_DEBUG_MV; - assert(enc->frame_rate_base == rfps_base); // should be true for now - if (enc->frame_rate != rfps) { + if (enc->frame_rate != rfps || enc->frame_rate_base != rfps_base) { if (verbose >= 0) - fprintf(stderr,"\nSeems that stream %d comes from film source: %2.2f->%2.2f\n", - i, (float)enc->frame_rate / enc->frame_rate_base, + fprintf(stderr,"\nSeems that stream %d comes from film source: %2.2f (%d/%d) -> %2.2f (%d/%d)\n", + i, (float)enc->frame_rate / enc->frame_rate_base, enc->frame_rate, enc->frame_rate_base, - (float)rfps / rfps_base); + (float)rfps / rfps_base, rfps, rfps_base); } /* update the current frame rate to match the stream frame rate */ frame_rate = rfps; |