Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>tags/n2.2-rc1
| @@ -140,6 +140,7 @@ OBJS-$(CONFIG_H264_DEMUXER) += h264dec.o rawdec.o | |||||
| OBJS-$(CONFIG_H264_MUXER) += rawenc.o | OBJS-$(CONFIG_H264_MUXER) += rawenc.o | ||||
| OBJS-$(CONFIG_HDS_MUXER) += hdsenc.o | OBJS-$(CONFIG_HDS_MUXER) += hdsenc.o | ||||
| OBJS-$(CONFIG_HEVC_DEMUXER) += hevcdec.o rawdec.o | OBJS-$(CONFIG_HEVC_DEMUXER) += hevcdec.o rawdec.o | ||||
| OBJS-$(CONFIG_HEVC_MUXER) += rawenc.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_HNM_DEMUXER) += hnm.o | OBJS-$(CONFIG_HNM_DEMUXER) += hnm.o | ||||
| @@ -118,7 +118,7 @@ void av_register_all(void) | |||||
| REGISTER_MUXDEMUX(H263, h263); | REGISTER_MUXDEMUX(H263, h263); | ||||
| REGISTER_MUXDEMUX(H264, h264); | REGISTER_MUXDEMUX(H264, h264); | ||||
| REGISTER_MUXER (HDS, hds); | REGISTER_MUXER (HDS, hds); | ||||
| REGISTER_DEMUXER (HEVC, hevc); | |||||
| REGISTER_MUXDEMUX(HEVC, hevc); | |||||
| REGISTER_MUXDEMUX(HLS, hls); | REGISTER_MUXDEMUX(HLS, hls); | ||||
| REGISTER_DEMUXER (HNM, hnm); | REGISTER_DEMUXER (HNM, hnm); | ||||
| REGISTER_DEMUXER (IDCIN, idcin); | REGISTER_DEMUXER (IDCIN, idcin); | ||||
| @@ -169,6 +169,18 @@ AVOutputFormat ff_h264_muxer = { | |||||
| }; | }; | ||||
| #endif | #endif | ||||
| #if CONFIG_HEVC_MUXER | |||||
| AVOutputFormat ff_hevc_muxer = { | |||||
| .name = "hevc", | |||||
| .long_name = NULL_IF_CONFIG_SMALL("raw HEVC video"), | |||||
| .extensions = "hevc", | |||||
| .audio_codec = AV_CODEC_ID_NONE, | |||||
| .video_codec = AV_CODEC_ID_HEVC, | |||||
| .write_packet = ff_raw_write_packet, | |||||
| .flags = AVFMT_NOTIMESTAMPS, | |||||
| }; | |||||
| #endif | |||||
| #if CONFIG_M4V_MUXER | #if CONFIG_M4V_MUXER | ||||
| AVOutputFormat ff_m4v_muxer = { | AVOutputFormat ff_m4v_muxer = { | ||||
| .name = "m4v", | .name = "m4v", | ||||
| @@ -30,7 +30,7 @@ | |||||
| #include "libavutil/version.h" | #include "libavutil/version.h" | ||||
| #define LIBAVFORMAT_VERSION_MAJOR 55 | #define LIBAVFORMAT_VERSION_MAJOR 55 | ||||
| #define LIBAVFORMAT_VERSION_MINOR 11 | |||||
| #define LIBAVFORMAT_VERSION_MINOR 12 | |||||
| #define LIBAVFORMAT_VERSION_MICRO 0 | #define LIBAVFORMAT_VERSION_MICRO 0 | ||||
| #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ | #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ | ||||