diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-12 13:29:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-13 00:26:27 +0200 |
| commit | 87fe0bbd69bfd70558d2d80a1768f94e6d14ed5a (patch) | |
| tree | c63014dfef0d1ff7b0406711d5487d5cbed6103a | |
| parent | fd54f700720a0fed7432a2b3741989d9bff09d99 (diff) | |
| download | ffmpeg-87fe0bbd69bfd70558d2d80a1768f94e6d14ed5a.tar.gz | |
lavc: rename h265 to hevc, add AV_CODEC_ID_H265 with identical value for backward compatibility
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>
| -rw-r--r-- | libavcodec/avcodec.h | 3 | ||||
| -rw-r--r-- | libavcodec/codec_desc.c | 4 | ||||
| -rw-r--r-- | libavformat/h265dec.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 2917a2ff8e..b632e686d5 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -302,7 +302,8 @@ enum AVCodecID { AV_CODEC_ID_SNOW = MKBETAG('S','N','O','W'), AV_CODEC_ID_WEBP = MKBETAG('W','E','B','P'), 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" */ AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 935df11995..bb5f92a985 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -226,9 +226,9 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS, }, { - .id = AV_CODEC_ID_H265, + .id = AV_CODEC_ID_HEVC, .type = AVMEDIA_TYPE_VIDEO, - .name = "h265", + .name = "hevc", .long_name = NULL_IF_CONFIG_SMALL("H.265 / HEVC"), .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS, }, diff --git a/libavformat/h265dec.c b/libavformat/h265dec.c index 1eb8402d86..ee209f3473 100644 --- a/libavformat/h265dec.c +++ b/libavformat/h265dec.c @@ -57,4 +57,4 @@ static int h265_probe(AVProbeData *p) 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) |