diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2012-12-27 22:36:47 +0100 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2012-12-30 22:46:42 +0100 |
| commit | 5c68aae90883497d59a2a49cf75816cf5906e14a (patch) | |
| tree | 83ede8ebe1751d4d3af4946ff8b8a1bd27a41c54 /libavcodec/avcodec.h | |
| parent | 5f02844c8d4fc93972932a84f0a5cbb02fe12a00 (diff) | |
Add VPlayer subtitles demuxer and decoder.
Note that the linebreaks text codec option (but not the feature) has
been removed; its main goal was to allow demuxers to configure the text
decoder (and not meant to be used by users), but the AVOption are not a
viable solution. This is solved differently in this commit.
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 69edcc9b48..8730ccbbba 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -467,6 +467,7 @@ enum AVCodecID { AV_CODEC_ID_SUBRIP = MKBETAG('S','R','i','p'), AV_CODEC_ID_WEBVTT = MKBETAG('W','V','T','T'), AV_CODEC_ID_MPL2 = MKBETAG('M','P','L','2'), + AV_CODEC_ID_VPLAYER = MKBETAG('V','P','l','r'), /* other specific kind of codecs (generally used for attachments) */ AV_CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs. |