diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-22 22:33:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-22 22:47:32 +0200 |
| commit | 55219a78c7d04d1937384366ba911c5d75c5c1e4 (patch) | |
| tree | 85efaa581ea0a51328bb8dda18727b84021b4c80 /libavcodec/codec_desc.c | |
| parent | 4df3cf90bf7a54793e90304bd1b6c7599673f36a (diff) | |
| parent | 7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7 (diff) | |
Merge commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7'
* commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7':
Hap decoder and encoder
Conflicts:
Changelog
configure
doc/general.texi
libavcodec/allcodecs.c
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 87bbc776b3..a5664906e1 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1252,6 +1252,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Canopus HQ/HQA"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_HAP, + .type = AVMEDIA_TYPE_VIDEO, + .name = "hap", + .long_name = NULL_IF_CONFIG_SMALL("Vidvox Hap decoder"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, /* image codecs */ { |