Merge remote-tracking branch 'qatar/master'

[ffmpeg] / ffmpeg.h

diff --git a/ffmpeg.h b/ffmpeg.h
index 047029d44401fbb2fa1394132a2c80b81096c2c7..292670a59f5b9ffb074d816da469b90b8f76e64a 100644 (file)
--- a/ffmpeg.h
+++ b/ffmpeg.h
@@ -57,12 +57,12 @@
 
 /* select an input stream for an output stream */
 typedef struct StreamMap {
-    int disabled;           /** 1 is this mapping is disabled by a negative map */
+    int disabled;           /* 1 is this mapping is disabled by a negative map */
     int file_index;
     int stream_index;
     int sync_file_index;
     int sync_stream_index;
-    char *linklabel;       /** name of an output link, for mapping lavfi outputs */
+    char *linklabel;       /* name of an output link, for mapping lavfi outputs */
 } StreamMap;
 
 typedef struct {
@@ -161,6 +161,8 @@ typedef struct OptionsContext {
     int        nb_copy_prior_start;
     SpecifierOpt *filters;
     int        nb_filters;
+    SpecifierOpt *reinit_filters;
+    int        nb_reinit_filters;
     SpecifierOpt *fix_sub_duration;
     int        nb_fix_sub_duration;
     SpecifierOpt *pass;
@@ -253,6 +255,8 @@ typedef struct InputStream {
      * currently video and audio only */
     InputFilter **filters;
     int        nb_filters;
+
+    int reinit_filters;
 } InputStream;
 
 typedef struct InputFile {