diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 14:03:29 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 14:19:26 +0300 |
| commit | 2cf521718d9427329b9324b00fb59caddcf42782 (patch) | |
| tree | 3802359d7d10019217a6d63c5ada55c6373a8c96 /libavcodec/codec_desc.c | |
| 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/codec_desc.c')
| -rw-r--r-- | libavcodec/codec_desc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 6c32f0bfc3..32dc1fc372 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1238,6 +1238,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("SGI RLE 8-bit"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, }, + { + .id = AV_CODEC_ID_HQX, + .type = AVMEDIA_TYPE_VIDEO, + .name = "hqx", + .long_name = NULL_IF_CONFIG_SMALL("Canopus HQX"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, /* image codecs */ { |