diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-07 16:07:07 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-07 16:07:07 +0200 |
| commit | d02d208211eb9a9de2e082942d007d558b2ce110 (patch) | |
| tree | 04aa6c6fcc585e23e022e3916eb0d62cb916408c /libavcodec/avcodec.h | |
| parent | aea611dc3e9e8e40c43b2b89f1af957c383cb0f3 (diff) | |
| parent | c45fcf30cfab687004ed1cdc06ebaa21f4262a0b (diff) | |
| download | ffmpeg-d02d208211eb9a9de2e082942d007d558b2ce110.tar.gz | |
Merge commit 'c45fcf30cfab687004ed1cdc06ebaa21f4262a0b'
* commit 'c45fcf30cfab687004ed1cdc06ebaa21f4262a0b':
DXV decoder
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
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 074b2cd22a..2c4eb1fa23 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -295,6 +295,7 @@ enum AVCodecID { AV_CODEC_ID_HQ_HQA, AV_CODEC_ID_HAP, AV_CODEC_ID_DDS, + AV_CODEC_ID_DXV, AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'), AV_CODEC_ID_Y41P = MKBETAG('Y','4','1','P'), |