diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 12:03:29 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 12:19:26 +0100 |
commit | 2cf521718d9427329b9324b00fb59caddcf42782 (patch) | |
tree | 3802359d7d10019217a6d63c5ada55c6373a8c96 /libavcodec/avcodec.h | |
parent | c0f02b220182cc7997bd6b5279881b898f52dfbf (diff) | |
parent | 35c6ce76b107225a19eb33aea38857d2405882af (diff) |
Merge commit '35c6ce76b107225a19eb33aea38857d2405882af'
* commit '35c6ce76b107225a19eb33aea38857d2405882af':
Canopus HQX decoder
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/version.h
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 447be7f5f6..575dae13e4 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -290,6 +290,7 @@ enum AVCodecID { AV_CODEC_ID_SGIRLE_DEPRECATED, AV_CODEC_ID_MVC1_DEPRECATED, AV_CODEC_ID_MVC2_DEPRECATED, + AV_CODEC_ID_HQX, AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'), AV_CODEC_ID_Y41P = MKBETAG('Y','4','1','P'), |