[FFmpeg-cvslog] avformat/options: add missing disposition flag to AVStream class options

James Almer git at videolan.org
Wed Oct 25 15:28:24 EEST 2023


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Oct 25 09:28:14 2023 -0300| [3c5bceb751891ae664319410f5dd8943732c15f0] | committer: James Almer

avformat/options: add missing disposition flag to AVStream class options

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3c5bceb751891ae664319410f5dd8943732c15f0
---

 libavformat/options.c | 1 +
 libavformat/version.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/options.c b/libavformat/options.c
index 0f79fe0fa4..1d8c52246b 100644
--- a/libavformat/options.c
+++ b/libavformat/options.c
@@ -222,6 +222,7 @@ static const AVOption stream_options[] = {
         { "clean_effects",      .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_CLEAN_EFFECTS     },    .unit = "disposition" },
         { "attached_pic",       .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_ATTACHED_PIC      },    .unit = "disposition" },
         { "timed_thumbnails",   .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_TIMED_THUMBNAILS  },    .unit = "disposition" },
+        { "non_diegetic",       .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_NON_DIEGETIC      },    .unit = "disposition" },
         { "captions",           .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_CAPTIONS          },    .unit = "disposition" },
         { "descriptions",       .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_DESCRIPTIONS      },    .unit = "disposition" },
         { "metadata",           .type = AV_OPT_TYPE_CONST, { .i64 = AV_DISPOSITION_METADATA          },    .unit = "disposition" },
diff --git a/libavformat/version.h b/libavformat/version.h
index eaf74946de..e6fbdfafc5 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -32,7 +32,7 @@
 #include "version_major.h"
 
 #define LIBAVFORMAT_VERSION_MINOR  15
-#define LIBAVFORMAT_VERSION_MICRO 100
+#define LIBAVFORMAT_VERSION_MICRO 101
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \



More information about the ffmpeg-cvslog mailing list