Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavc: copy subtitle_header when copying context.
  lavf: data muxer and demuxer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libavcodec/options.c b/libavcodec/options.c
index e1349dd3a8edd0c829058253f8646f44a42e4d09..fb803f3fd684f55d4b5a1837477685d3b6b154d8 100644 (file)
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -226,6 +226,7 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
     alloc_and_copy_or_fail(intra_matrix, 64 * sizeof(int16_t), 0);
     alloc_and_copy_or_fail(inter_matrix, 64 * sizeof(int16_t), 0);
     alloc_and_copy_or_fail(rc_override,  src->rc_override_count * sizeof(*src->rc_override), 0);
+    alloc_and_copy_or_fail(subtitle_header, src->subtitle_header_size, 1);
 #undef alloc_and_copy_or_fail
 
     return 0;

diff --git a/libavformat/Makefile b/libavformat/Makefile
index ca74102875e8c3d93b5f344f7ed86eb36eb444e4..36797085a0b8f58a911b781d1f10a280d37a8a08 100644 (file)
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -103,6 +103,8 @@ OBJS-$(CONFIG_CDG_DEMUXER)               += cdg.o
 OBJS-$(CONFIG_CDXL_DEMUXER)              += cdxl.o
 OBJS-$(CONFIG_CONCAT_DEMUXER)            += concatdec.o
 OBJS-$(CONFIG_CRC_MUXER)                 += crcenc.o
+OBJS-$(CONFIG_DATA_DEMUXER)              += rawdec.o
+OBJS-$(CONFIG_DATA_MUXER)                += rawdec.o
 OBJS-$(CONFIG_DAUD_DEMUXER)              += daud.o
 OBJS-$(CONFIG_DAUD_MUXER)                += daud.o
 OBJS-$(CONFIG_DFA_DEMUXER)               += dfa.o

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index f29843a52e0a741731194b0603a30836d0e52d98..bca2c401a51860461cfbe52f6e347deabd0d58be 100644 (file)
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -100,6 +100,7 @@ void av_register_all(void)
     REGISTER_DEMUXER (CDXL,             cdxl);
     REGISTER_DEMUXER (CONCAT,           concat);
     REGISTER_MUXER   (CRC,              crc);
+    REGISTER_MUXDEMUX(DATA,             data);
     REGISTER_MUXDEMUX(DAUD,             daud);
     REGISTER_DEMUXER (DFA,              dfa);
     REGISTER_MUXDEMUX(DIRAC,            dirac);

diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c
index 153cc7b04ea9d1be172947c1ea594786c47c11e0..a9ff22ae182459d7007893fb069fc4073aaa9c6d 100644 (file)
--- a/libavformat/rawdec.c
+++ b/libavformat/rawdec.c
@@ -90,6 +90,17 @@ fail:
     return ret;
 }
 
+static int ff_raw_data_read_header(AVFormatContext *s)
+{
+    AVStream *st = avformat_new_stream(s, NULL);
+    if (!st)
+        return AVERROR(ENOMEM);
+    st->codec->codec_type = AVMEDIA_TYPE_DATA;
+    st->codec->codec_id = s->iformat->raw_codec_id;
+    st->start_time = 0;
+    return 0;
+}
+
 /* Note: Do not forget to add new entries to the Makefile as well. */
 
 #define OFFSET(x) offsetof(FFRawVideoDemuxerContext, x)
@@ -99,6 +110,16 @@ const AVOption ff_rawvideo_options[] = {
     { NULL },
 };
 
+#if CONFIG_DATA_DEMUXER
+AVInputFormat ff_data_demuxer = {
+    .name           = "data",
+    .long_name      = NULL_IF_CONFIG_SMALL("raw data"),
+    .read_header    = ff_raw_data_read_header,
+    .read_packet    = ff_raw_read_partial_packet,
+    .raw_codec_id   = AV_CODEC_ID_NONE,
+};
+#endif
+
 #if CONFIG_LATM_DEMUXER
 AVInputFormat ff_latm_demuxer = {
     .name           = "latm",

diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c
index 7894c8e0c5d59fea7aef73c3c40f3cf1cdfd1b51..7a1fa93e8badfb0b533a34ba2dd79cb0d94dad79 100644 (file)
--- a/libavformat/rawenc.c
+++ b/libavformat/rawenc.c
@@ -68,6 +68,15 @@ AVOutputFormat ff_cavsvideo_muxer = {
 };
 #endif
 
+#if CONFIG_DATA_MUXER
+AVOutputFormat ff_data_muxer = {
+    .name              = "data",
+    .long_name         = NULL_IF_CONFIG_SMALL("raw data"),
+    .write_packet      = ff_raw_write_packet,
+    .flags             = AVFMT_NOTIMESTAMPS,
+};
+#endif
+
 #if CONFIG_DIRAC_MUXER
 AVOutputFormat ff_dirac_muxer = {
     .name              = "dirac",

diff --git a/libavformat/version.h b/libavformat/version.h
index 8fd08cf032da3806643a8949e620334d771048bd..3e186a9e0249e90666f2bcfcf8e1d2f6af4d2912 100644 (file)
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -30,7 +30,7 @@
 #include "libavutil/avutil.h"
 
 #define LIBAVFORMAT_VERSION_MAJOR 55
-#define LIBAVFORMAT_VERSION_MINOR  3
+#define LIBAVFORMAT_VERSION_MINOR  4
 #define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \