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/codec_desc.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 '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 b51d0e9a5b..c1694f3383 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1245,6 +1245,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Canopus HQX"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_HQ_HQA, + .type = AVMEDIA_TYPE_VIDEO, + .name = "hq_hqa", + .long_name = NULL_IF_CONFIG_SMALL("Canopus HQ/HQA"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, /* image codecs */ { |