Merge commit '61a344916d324c8ca52064964478f46c877f02e2'

[ffmpeg] / ffmpeg.h

diff --git a/ffmpeg.h b/ffmpeg.h
index a794255e6f90777dd337e3da6d84cf5a75a43785..30890a0ee85f9561c46273d20203ebde17d0deae 100644 (file)
--- a/ffmpeg.h
+++ b/ffmpeg.h
@@ -204,6 +204,8 @@ typedef struct OptionsContext {
     int        nb_guess_layout_max;
     SpecifierOpt *apad;
     int        nb_apad;
+    SpecifierOpt *discard;
+    int        nb_discard;
 } OptionsContext;
 
 typedef struct InputFilter {
@@ -240,6 +242,7 @@ typedef struct InputStream {
     int file_index;
     AVStream *st;
     int discard;             /* true if stream data should be discarded */
+    int user_set_discard;
     int decoding_needed;     /* true if the packets must be decoded in 'raw_fifo' */
     AVCodecContext *dec_ctx;
     AVCodec *dec;