fftools/ffmpeg: Check if we do have also a filter_complex filter.
authorThierry Foucu <tfoucu@gmail.com>
Wed, 27 Mar 2019 21:11:59 +0000 (14:11 -0700)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 28 Mar 2019 20:29:20 +0000 (21:29 +0100)
Right now, the code check for no filter description, but if we use a
filter_complex, the code will use the AVFrame.duration which could be
wrong in case of using fps filter.

How to reproduce the problem:
ffmpeg -f lavfi -i testsrc=duration=1 -vf fps=fps=50 -vsync 1 -f null -
output 50 frames

ffmpeg -f lavfi -i testsrc=duration=1 -filter_complex fps=fps=50 -vsync 1 -f null -
output 51 frames

With this commit, the same command will always output 50 frames.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
fftools/ffmpeg.c

index 544f1a1..0f157d6 100644 (file)
@@ -1079,6 +1079,7 @@ static void do_video_out(OutputFile *of,
 
     if (!ost->filters_script &&
         !ost->filters &&
+        (nb_filtergraphs == 0 || !filtergraphs[0]->graph_desc) &&
         next_picture &&
         ist &&
         lrintf(next_picture->pkt_duration * av_q2d(ist->st->time_base) / av_q2d(enc->time_base)) > 0) {