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 /libavformat/riff.c | |
parent | fcca7671e29b67812d29af710ff90486944ee428 (diff) | |
parent | 22526c1f557a72b3285d295bd8b30c40eb65d437 (diff) | |
download | ffmpeg-5a284d076ffdca705204e3e4100917cd4dbda14c.tar.gz |
Merge commit '22526c1f557a72b3285d295bd8b30c40eb65d437'
* commit '22526c1f557a72b3285d295bd8b30c40eb65d437':
Canopus HQ/HQA decoder
Conflicts:
Changelog
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riff.c')
-rw-r--r-- | libavformat/riff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 0f98422530..71c04d225d 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -366,6 +366,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_FIC, MKTAG('F', 'I', 'C', 'V') }, { AV_CODEC_ID_HQX, MKTAG('C', 'H', 'Q', 'X') }, { AV_CODEC_ID_TDSC, MKTAG('T', 'D', 'S', 'C') }, + { AV_CODEC_ID_HQ_HQA, MKTAG('C', 'U', 'V', 'C') }, { AV_CODEC_ID_NONE, 0 } }; |