Signed-off-by: Michael Niedermayer <michaelni@gmx.at>tags/n2.1
@@ -166,7 +166,7 @@ OBJS-$(CONFIG_H263_DEMUXER) += h263dec.o rawdec.o | |||||
OBJS-$(CONFIG_H263_MUXER) += rawenc.o | OBJS-$(CONFIG_H263_MUXER) += rawenc.o | ||||
OBJS-$(CONFIG_H264_DEMUXER) += h264dec.o rawdec.o | OBJS-$(CONFIG_H264_DEMUXER) += h264dec.o rawdec.o | ||||
OBJS-$(CONFIG_H264_MUXER) += rawenc.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_DEMUXER) += hls.o | ||||
OBJS-$(CONFIG_HLS_MUXER) += hlsenc.o | OBJS-$(CONFIG_HLS_MUXER) += hlsenc.o | ||||
OBJS-$(CONFIG_ICO_DEMUXER) += icodec.o | OBJS-$(CONFIG_ICO_DEMUXER) += icodec.o | ||||
@@ -135,7 +135,7 @@ void av_register_all(void) | |||||
REGISTER_MUXDEMUX(H261, h261); | REGISTER_MUXDEMUX(H261, h261); | ||||
REGISTER_MUXDEMUX(H263, h263); | REGISTER_MUXDEMUX(H263, h263); | ||||
REGISTER_MUXDEMUX(H264, h264); | REGISTER_MUXDEMUX(H264, h264); | ||||
REGISTER_DEMUXER (H265, h265); | |||||
REGISTER_DEMUXER (HEVC, hevc); | |||||
REGISTER_MUXDEMUX(HLS, hls); | REGISTER_MUXDEMUX(HLS, hls); | ||||
REGISTER_MUXDEMUX(ICO, ico); | REGISTER_MUXDEMUX(ICO, ico); | ||||
REGISTER_DEMUXER (IDCIN, idcin); | REGISTER_DEMUXER (IDCIN, idcin); | ||||
@@ -22,7 +22,7 @@ | |||||
#include "avformat.h" | #include "avformat.h" | ||||
#include "rawdec.h" | #include "rawdec.h" | ||||
static int h265_probe(AVProbeData *p) | |||||
static int hevc_probe(AVProbeData *p) | |||||
{ | { | ||||
uint32_t code= -1; | uint32_t code= -1; | ||||
int vps=0, sps=0, pps=0, idr=0; | int vps=0, sps=0, pps=0, idr=0; | ||||
@@ -57,4 +57,4 @@ static int h265_probe(AVProbeData *p) | |||||
return 0; | 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) |