summaryrefslogtreecommitdiff
path: root/libavformat/avformat.h
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2010-07-02 16:38:44 +0000
committerAurelien Jacobs <aurel@gnuage.org>2010-07-02 16:38:44 +0000
commit7a617a86348d690cc63f36f409d53ff60b7d6fba (patch)
tree418e1e6e8fe6a3d0f5dde22fc2812450c6cf1054 /libavformat/avformat.h
parentc01694c8893292ea3f80f195874212cba18fa8e8 (diff)
add AV_DISPOSITION_FORCED flag and use it in matroska demuxer
Originally committed as revision 24003 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/avformat.h')
-rw-r--r--libavformat/avformat.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 0b9892605c..8229bedb9f 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -396,6 +396,10 @@ typedef struct AVIndexEntry {
#define AV_DISPOSITION_COMMENT 0x0008
#define AV_DISPOSITION_LYRICS 0x0010
#define AV_DISPOSITION_KARAOKE 0x0020
+/** Track should be used during playback by default.
+ Useful for subtitle track that should be displayed
+ even when user did not explicitly ask for subtitles. */
+#define AV_DISPOSITION_FORCED 0x0040
/**
* Stream structure.