diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-15 23:18:48 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-15 23:23:57 +0400 |
| commit | 12cc3bf29ae4c0bc843f48efaad1df3e88fce63a (patch) | |
| tree | 6b25599273df83080635a54886b1fb408582640c /libavformat | |
| parent | 59352a07d856a67b81fe3480ac4644a92beac113 (diff) | |
avformat: rename a few more h.265 to HEVC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/allformats.c | 2 | ||||
| -rw-r--r-- | libavformat/hevcdec.c (renamed from libavformat/h265dec.c) | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 510701278e..9d4b6268ad 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -166,7 +166,7 @@ OBJS-$(CONFIG_H263_DEMUXER) += h263dec.o rawdec.o OBJS-$(CONFIG_H263_MUXER) += rawenc.o OBJS-$(CONFIG_H264_DEMUXER) += h264dec.o rawdec.o OBJS-$(CONFIG_H264_MUXER) += rawenc.o -OBJS-$(CONFIG_H265_DEMUXER) += h265dec.o rawdec.o +OBJS-$(CONFIG_HEVC_DEMUXER) += hevcdec.o rawdec.o OBJS-$(CONFIG_HLS_DEMUXER) += hls.o OBJS-$(CONFIG_HLS_MUXER) += hlsenc.o OBJS-$(CONFIG_ICO_DEMUXER) += icodec.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index e9eafb4de7..0e1b262904 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -135,7 +135,7 @@ void av_register_all(void) REGISTER_MUXDEMUX(H261, h261); REGISTER_MUXDEMUX(H263, h263); REGISTER_MUXDEMUX(H264, h264); - REGISTER_DEMUXER (H265, h265); + REGISTER_DEMUXER (HEVC, hevc); REGISTER_MUXDEMUX(HLS, hls); REGISTER_MUXDEMUX(ICO, ico); REGISTER_DEMUXER (IDCIN, idcin); diff --git a/libavformat/h265dec.c b/libavformat/hevcdec.c index ee209f3473..51e1504459 100644 --- a/libavformat/h265dec.c +++ b/libavformat/hevcdec.c @@ -22,7 +22,7 @@ #include "avformat.h" #include "rawdec.h" -static int h265_probe(AVProbeData *p) +static int hevc_probe(AVProbeData *p) { uint32_t code= -1; int vps=0, sps=0, pps=0, idr=0; @@ -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_HEVC) +FF_DEF_RAWVIDEO_DEMUXER(hevc , "raw HEVC video", hevc_probe, "h265,265,hevc", AV_CODEC_ID_HEVC) |