]> git.sesse.net Git - ffmpeg/commitdiff
avfilter/dualinput: Add support to skip initial unpaired frames
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 24 Jun 2016 22:22:47 +0000 (00:22 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sat, 25 Jun 2016 23:01:28 +0000 (01:01 +0200)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavfilter/dualinput.c
libavfilter/dualinput.h

index 1a078a25e43d5565ddf3968d4089762f872fd647..44750973a60e07d21085e25b51334768d599df89 100644 (file)
@@ -66,6 +66,9 @@ int ff_dualinput_init(AVFilterContext *ctx, FFDualInputContext *s)
         in[1].after = EXT_NULL;
         in[1].sync  = 0;
     }
+    if (s->skip_initial_unpaired) {
+        in[1].before = EXT_STOP;
+    }
 
     return ff_framesync_configure(&s->fs);
 }
index 5ff23e62495e6318ecf419be506b1bdf1a3342fc..707b10c3977886cf6fa4bdf0516fbe3d3a59d3c8 100644 (file)
@@ -35,6 +35,7 @@ typedef struct {
     AVFrame *(*process)(AVFilterContext *ctx, AVFrame *main, const AVFrame *second);
     int shortest;               ///< terminate stream when the second input terminates
     int repeatlast;             ///< repeat last second frame
+    int skip_initial_unpaired;  ///< Skip initial frames that do not have a 2nd input
 } FFDualInputContext;
 
 int ff_dualinput_init(AVFilterContext *ctx, FFDualInputContext *s);