summaryrefslogtreecommitdiff
path: root/libavformat/smoothstreamingenc.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2012-09-18 11:31:44 +0300
committerMartin Storsjö <martin@martin.st>2012-09-18 17:59:57 +0300
commit84cc314e40dc0a8844a322e54c2827d247f3cc7e (patch)
tree31b9f912b4463546a3fb974c99048d0b5767eb59 /libavformat/smoothstreamingenc.c
parent9888ffb1ce5e0a17f711b01933d504c72ea29d3b (diff)
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@martin.st>
Diffstat (limited to 'libavformat/smoothstreamingenc.c')
-rw-r--r--libavformat/smoothstreamingenc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c
index 5ddba7eb06..08e6526533 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,
};