History

lavf: add AV_DISPOSITION flags for WebVTT text track kinds

There are 4 separate WebVTT text track kinds: subtitles (the default if not otherwise specified), captions, descriptions, and metadata. The WebM muxer needs to know which WebVTT text track kind this is, in order to synthesize the correct track type and codec id. To allow a demuxer to indicate the text track kind of the input, a new set of AV_DISPOSITION flag values has been added, corresponding to each of the non-default text track kind values.

Matthew Heaney committed 13 years ago

Commit bc35df21 parent 61c82213 files · +11 −1Browse files

Unified · Split

3 files
  1. doc/APIchanges +3 −0
  2. libavformat/avformat.h +7 −0
  3. libavformat/version.h +1 −1
doc/APIchanges+3−0
@@ -18,6 +18,9 @@ API changes, most recent first: · 17 unmodified lines
1818 2013-06-xx - xxxxxxx - lavc 55.10.0 - avcodec.h
1919 Add MPEG-2 AAC profiles
2020
21+2013-06-xx - xxxxxxx - lavf 55.10.100 - avformat.h
22+ Add AV_DISPOSITION_* flags to indicate text track kind.
23+
2124 2013-06-xx - xxxxxxx - lavu 52.36.100
2225 Add AVRIPEMD:
2326 av_ripemd_alloc()
libavformat/avformat.h+7−0
@@ -635,6 +635,13 @@ typedef struct AVIndexEntry { · 634 unmodified lines
635635 */
636636 #define AV_DISPOSITION_ATTACHED_PIC 0x0400
637637
638+/**
639+ * To specify text track kind (different from subtitles default).
640+ */
641+#define AV_DISPOSITION_CAPTIONS 0x10000
642+#define AV_DISPOSITION_DESCRIPTIONS 0x20000
643+#define AV_DISPOSITION_METADATA 0x40000
644+
638645 /**
639646 * Options for behavior on timestamp wrap detection.
640647 */
libavformat/version.h+1−1
@@ -30,7 +30,7 @@ · 29 unmodified lines
3030 #include "libavutil/avutil.h"
3131
3232 #define LIBAVFORMAT_VERSION_MAJOR 55
33−#define LIBAVFORMAT_VERSION_MINOR 9
33+#define LIBAVFORMAT_VERSION_MINOR 10
3434 #define LIBAVFORMAT_VERSION_MICRO 100
3535
3636 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t