lavc: rename h265 to hevc, add AV_CODEC_ID_H265 with identical value for backward...
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Oct 2013 11:29:31 +0000 (13:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Oct 2013 22:26:27 +0000 (00:26 +0200)
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>
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavformat/h265dec.c

index 2917a2ff8e0bf04dc5995fd2d30eff43c0f7616b..b632e686d5543a3ae780b317fe82a0088d763117 100644 (file)
@@ -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
index 935df119954fc5846e0fc393b80a0144a55f00ff..bb5f92a985d85acea99ba4c0e46e43c47a9a506f 100644 (file)
@@ -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,
     },
index 1eb8402d86e1f27619adb94dd6c9f3f0f5964927..ee209f347365decd4000544384ce9554f71c9eff 100644 (file)
@@ -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)