[libav-commits] smoothstreaming: Export the mp4 codec tags

Martin Storsjö git at libav.org
Tue Sep 18 17:01:08 CEST 2012


Module: libav
Branch: master
Commit: 84cc314e40dc0a8844a322e54c2827d247f3cc7e

Author:    Martin Storsjö <martin at martin.st>
Committer: Martin Storsjö <martin at martin.st>
Date:      Tue Sep 18 11:31:44 2012 +0300

smoothstreaming: Export the mp4 codec tags

This fixes stream copy from a format that already has incompatible
codec tags set. The chained ismv muxer exports this same codec tag
list, so set it on this one as well, to allow the caller (and
lavf common code) to set them correctly.

Signed-off-by: Martin Storsjö <martin at martin.st>

---

 libavformat/Makefile             |    2 +-
 libavformat/smoothstreamingenc.c |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/libavformat/Makefile b/libavformat/Makefile
index ae168b6..53cc675 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -292,7 +292,7 @@ OBJS-$(CONFIG_SIFF_DEMUXER)              += siff.o
 OBJS-$(CONFIG_SMACKER_DEMUXER)           += smacker.o
 OBJS-$(CONFIG_SMJPEG_DEMUXER)            += smjpegdec.o smjpeg.o
 OBJS-$(CONFIG_SMJPEG_MUXER)              += smjpegenc.o smjpeg.o
-OBJS-$(CONFIG_SMOOTHSTREAMING_MUXER)     += smoothstreamingenc.o
+OBJS-$(CONFIG_SMOOTHSTREAMING_MUXER)     += smoothstreamingenc.o isom.o
 OBJS-$(CONFIG_SOL_DEMUXER)               += sol.o pcm.o
 OBJS-$(CONFIG_SOX_DEMUXER)               += soxdec.o pcm.o
 OBJS-$(CONFIG_SOX_MUXER)                 += soxenc.o
diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c
index 5ddba7e..08e6526 100644
--- a/libavformat/smoothstreamingenc.c
+++ b/libavformat/smoothstreamingenc.c
@@ -30,6 +30,7 @@
 #include "os_support.h"
 #include "avc.h"
 #include "url.h"
+#include "isom.h"
 
 #include "libavutil/opt.h"
 #include "libavutil/avstring.h"
@@ -617,5 +618,6 @@ AVOutputFormat ff_smoothstreaming_muxer = {
     .write_header   = ism_write_header,
     .write_packet   = ism_write_packet,
     .write_trailer  = ism_write_trailer,
+    .codec_tag      = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 },
     .priv_class     = &ism_class,
 };



More information about the libav-commits mailing list