har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavc: rename h265 to hevc, add AV_CODEC_ID_H265 with identical value for backward compatibility

Browse Source 
Somehow 2 different identifiers have come into existence which makes supporting
both until the next major version bump required
I did not investigate how exactly that did happen.

wm4, j-b and smarter prefer hevc.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-12 13:29:31 +02:00
parent fd54f70072
commit 87fe0bbd69
3 changed files with 5 additions and 4 deletions
libavcodec
avcodec.hcodec_desc.c
libavformat
h265dec.c

3
libavcodec/avcodec.h

@ -302,7 +302,8 @@ enum AVCodecID {
AV_CODEC_ID_SNOW = MKBETAG('S','N','O','W'), AV_CODEC_ID_SNOW = MKBETAG('S','N','O','W'),
AV_CODEC_ID_WEBP = MKBETAG('W','E','B','P'), AV_CODEC_ID_WEBP = MKBETAG('W','E','B','P'),
AV_CODEC_ID_SMVJPEG = MKBETAG('S','M','V','J'), AV_CODEC_ID_SMVJPEG = MKBETAG('S','M','V','J'),
AV_CODEC_ID_H265 = MKBETAG('H','2','6','5'), AV_CODEC_ID_HEVC = MKBETAG('H','2','6','5'),
#define AV_CODEC_ID_H265 AV_CODEC_ID_HEVC
/* various PCM "codecs" */ /* various PCM "codecs" */
AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs

4
libavcodec/codec_desc.c

@ -226,9 +226,9 @@ static const AVCodecDescriptor codec_descriptors[] = {
.props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS, .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS,
}, },
{ {
.id = AV_CODEC_ID_H265, .id = AV_CODEC_ID_HEVC,
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.name = "h265", .name = "hevc",
.long_name = NULL_IF_CONFIG_SMALL("H.265 / HEVC"), .long_name = NULL_IF_CONFIG_SMALL("H.265 / HEVC"),
.props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS, .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS,
}, },

2
libavformat/h265dec.c

@ -57,4 +57,4 @@ static int h265_probe(AVProbeData *p)
return 0; return 0;
} }
FF_DEF_RAWVIDEO_DEMUXER(h265 , "raw H.265 video", h265_probe, "h265,265,hevc", AV_CODEC_ID_H265) FF_DEF_RAWVIDEO_DEMUXER(h265 , "raw H.265 video", h265_probe, "h265,265,hevc", AV_CODEC_ID_HEVC)