Merge commit '302ca6b20ed01ac584f5b15d5bca3d3a92b7a77a'

[ffmpeg] / ffmpeg.h

diff --git a/ffmpeg.h b/ffmpeg.h
index 0ad1e372670d86a8c399550febc68c31419c6f77..cb425b324af9a5f1fd020ae5b93aaf1c95a6d6c4 100644 (file)
--- a/ffmpeg.h
+++ b/ffmpeg.h
@@ -206,6 +206,8 @@ typedef struct OptionsContext {
     int        nb_apad;
     SpecifierOpt *discard;
     int        nb_discard;
+    SpecifierOpt *disposition;
+    int        nb_disposition;
 } OptionsContext;
 
 typedef struct InputFilter {
@@ -430,6 +432,7 @@ typedef struct OutputStream {
     const char *attachment_filename;
     int copy_initial_nonkeyframes;
     int copy_prior_start;
+    char *disposition;
 
     int keep_pix_fmt;