mirror of https://git.ffmpeg.org/ffmpeg.git
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
This commit is contained in:
parent
653d7aeb61
commit
f32f7d8b24
2
ffmpeg.c
2
ffmpeg.c
|
@ -3058,7 +3058,7 @@ static void opt_input_file(const char *filename)
|
||||||
if(me_threshold)
|
if(me_threshold)
|
||||||
enc->debug |= FF_DEBUG_MV;
|
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)
|
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",
|
fprintf(stderr,"\nSeems stream %d codec frame rate differs from container frame rate: %2.2f (%d/%d) -> %2.2f (%d/%d)\n",
|
||||||
|
|
Loading…
Reference in New Issue