diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 16:14:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 17:13:00 +0100 |
| commit | 5eb1704d5f5a85ff5b532887d559f3cf2822d8fc (patch) | |
| tree | 9282c0edf8e3dd4b4dd014f157044c34dc6527cb /libavcodec/codec_desc.c | |
| parent | c617c669e9fce59905915c3ba1053f535add6a06 (diff) | |
| parent | 064698d381e1e7790f21b0199a8930ea04e2e942 (diff) | |
Merge commit '064698d381e1e7790f21b0199a8930ea04e2e942'
* commit '064698d381e1e7790f21b0199a8930ea04e2e942':
Add HEVC decoder
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/hevc.c
libavcodec/hevc.h
libavcodec/hevc_cabac.c
libavcodec/hevc_filter.c
libavcodec/hevc_mvs.c
libavcodec/hevc_parser.c
libavcodec/hevc_ps.c
libavcodec/hevc_refs.c
libavcodec/hevc_sei.c
libavcodec/hevcdsp.c
libavcodec/hevcdsp_template.c
libavcodec/hevcpred.c
libavcodec/hevcpred_template.c
libavcodec/version.h
cosmetics from hevc.h & hevc_ps.c mostly merged, other files left as they where in ffmpeg.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/codec_desc.c')
| -rw-r--r-- | libavcodec/codec_desc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 3a08891567..4cf30fc03d 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -226,13 +226,6 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS, }, { - .id = AV_CODEC_ID_HEVC, - .type = AVMEDIA_TYPE_VIDEO, - .name = "hevc", - .long_name = NULL_IF_CONFIG_SMALL("H.265 / HEVC"), - .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS, - }, - { .id = AV_CODEC_ID_INDEO3, .type = AVMEDIA_TYPE_VIDEO, .name = "indeo3", @@ -1401,6 +1394,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("HNM 4 video"), .props = AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_HEVC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "hevc", + .long_name = NULL_IF_CONFIG_SMALL("H.265 / HEVC (High Efficiency Video Coding)"), + .props = AV_CODEC_PROP_LOSSY, + }, /* various PCM "codecs" */ { |