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 /libavcodec/avcodec.h | |
| 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>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 3 |
1 files changed, 2 insertions, 1 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 |