From: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Date: Wed, 2 Oct 2013 14:46:25 +0000 (+0000)
Subject: Add raw HEVC muxer
X-Git-Tag: android-x86-6.0-r1~10^2~2228
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=722554788b77c13748e83458f626a9ac38b70072;p=android-x86%2Fexternal-ffmpeg.git

Add raw HEVC muxer

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
---

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 8605a1cecd..4da3c3b082 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -140,6 +140,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 3bc128b818..52a121e3bc 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -118,7 +118,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_DEMUXER (IDCIN,            idcin);
diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c
index 852a27d6e4..eb50626100 100644
--- a/libavformat/rawenc.c
+++ b/libavformat/rawenc.c
@@ -169,6 +169,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 3b96d0a976..3d1e21f17b 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 11
+#define LIBAVFORMAT_VERSION_MINOR 12
 #define LIBAVFORMAT_VERSION_MICRO  0
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \