From 87fe0bbd69bfd70558d2d80a1768f94e6d14ed5a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 12 Oct 2013 13:29:31 +0200 Subject: 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 --- libavformat/h265dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavformat') 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) -- cgit v1.2.3