diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 05:28:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 05:28:13 +0200 |
| commit | 5a284d076ffdca705204e3e4100917cd4dbda14c (patch) | |
| tree | 409db710f32304c4192b2cebf4446bb0242b8189 /libavcodec/avcodec.h | |
| parent | fcca7671e29b67812d29af710ff90486944ee428 (diff) | |
| parent | 22526c1f557a72b3285d295bd8b30c40eb65d437 (diff) | |
Merge commit '22526c1f557a72b3285d295bd8b30c40eb65d437'
* commit '22526c1f557a72b3285d295bd8b30c40eb65d437':
Canopus HQ/HQA decoder
Conflicts:
Changelog
libavcodec/version.h
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 48e212f939..8c7c4201a6 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -292,6 +292,7 @@ enum AVCodecID { AV_CODEC_ID_MVC2_DEPRECATED, AV_CODEC_ID_HQX, AV_CODEC_ID_TDSC, + AV_CODEC_ID_HQ_HQA, AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'), AV_CODEC_ID_Y41P = MKBETAG('Y','4','1','P'), |