diff options
| author | Matthew Heaney <matthewjheaney@google.com> | 2013-06-24 11:18:05 -0700 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2013-06-25 00:13:47 +0200 |
| commit | bc35df29c123f695abe60c13539dbf112b465d07 (patch) | |
| tree | a11cf310fae20addc9eb1ca2c5052be9b06bb3cb | |
| parent | 61c82214afacf6866952925ced6fbf19ce86cf49 (diff) | |
| download | ffmpeg-bc35df29c123f695abe60c13539dbf112b465d07.tar.gz | |
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.
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libavformat/avformat.h | 7 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 880687ba63..2c0eae8d81 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -18,6 +18,9 @@ API changes, most recent first: 2013-06-xx - xxxxxxx - lavc 55.10.0 - avcodec.h Add MPEG-2 AAC profiles +2013-06-xx - xxxxxxx - lavf 55.10.100 - avformat.h + Add AV_DISPOSITION_* flags to indicate text track kind. + 2013-06-xx - xxxxxxx - lavu 52.36.100 Add AVRIPEMD: av_ripemd_alloc() diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 1d7ba45b32..bd911ecfda 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -636,6 +636,13 @@ typedef struct AVIndexEntry { #define AV_DISPOSITION_ATTACHED_PIC 0x0400 /** + * To specify text track kind (different from subtitles default). + */ +#define AV_DISPOSITION_CAPTIONS 0x10000 +#define AV_DISPOSITION_DESCRIPTIONS 0x20000 +#define AV_DISPOSITION_METADATA 0x40000 + +/** * Options for behavior on timestamp wrap detection. */ #define AV_PTS_WRAP_IGNORE 0 ///< ignore the wrap diff --git a/libavformat/version.h b/libavformat/version.h index b2221d2ed7..45932d4972 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,7 +30,7 @@ #include "libavutil/avutil.h" #define LIBAVFORMAT_VERSION_MAJOR 55 -#define LIBAVFORMAT_VERSION_MINOR 9 +#define LIBAVFORMAT_VERSION_MINOR 10 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |