aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-12 13:29:31 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-13 00:26:27 +0200
commit87fe0bbd69bfd70558d2d80a1768f94e6d14ed5a (patch)
treec63014dfef0d1ff7b0406711d5487d5cbed6103a /libavformat
parentfd54f700720a0fed7432a2b3741989d9bff09d99 (diff)
downloadffmpeg-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>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/h265dec.c2
1 files changed, 1 insertions, 1 deletions
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)