diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2013-10-02 14:46:25 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2014-02-09 14:29:07 +0000 |
| commit | ef5d32b9c5313a1e4491d7f647deae5cb76ca4b0 (patch) | |
| tree | a849f9470f413630a1b56767f737a4a4b075338e /libavformat | |
| parent | 4040b56f5afd07df6403df2a76206b54c79449cf (diff) | |
| download | android_external_ffmpeg-ef5d32b9c5313a1e4491d7f647deae5cb76ca4b0.tar.gz android_external_ffmpeg-ef5d32b9c5313a1e4491d7f647deae5cb76ca4b0.tar.bz2 android_external_ffmpeg-ef5d32b9c5313a1e4491d7f647deae5cb76ca4b0.zip | |
Add raw HEVC muxer
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 1 | ||||
| -rw-r--r-- | libavformat/allformats.c | 2 | ||||
| -rw-r--r-- | libavformat/rawenc.c | 12 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
4 files changed, 15 insertions, 2 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index f1566c876d..72ef8c7c44 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -166,6 +166,7 @@ OBJS-$(CONFIG_H264_DEMUXER) += h264dec.o rawdec.o OBJS-$(CONFIG_H264_MUXER) += rawenc.o OBJS-$(CONFIG_HDS_MUXER) += hdsenc.o OBJS-$(CONFIG_HEVC_DEMUXER) += hevcdec.o rawdec.o +OBJS-$(CONFIG_HEVC_MUXER) += rawenc.o OBJS-$(CONFIG_HLS_DEMUXER) += hls.o OBJS-$(CONFIG_HLS_MUXER) += hlsenc.o OBJS-$(CONFIG_HNM_DEMUXER) += hnm.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index f1039dda84..195e6fb168 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -135,7 +135,7 @@ void av_register_all(void) REGISTER_MUXDEMUX(H263, h263); REGISTER_MUXDEMUX(H264, h264); REGISTER_MUXER (HDS, hds); - REGISTER_DEMUXER (HEVC, hevc); + REGISTER_MUXDEMUX(HEVC, hevc); REGISTER_MUXDEMUX(HLS, hls); REGISTER_DEMUXER (HNM, hnm); REGISTER_MUXDEMUX(ICO, ico); diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index 5044698c41..abd7e66978 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -214,6 +214,18 @@ AVOutputFormat ff_h264_muxer = { }; #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 AVOutputFormat ff_m4v_muxer = { .name = "m4v", diff --git a/libavformat/version.h b/libavformat/version.h index 0fcbe60eaa..440e9ca89b 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFORMAT_VERSION_MAJOR 55 -#define LIBAVFORMAT_VERSION_MINOR 30 +#define LIBAVFORMAT_VERSION_MINOR 31 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |