diff options
| author | Martin Storsjö <martin@martin.st> | 2012-09-18 11:31:44 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-09-18 17:59:57 +0300 |
| commit | 84cc314e40dc0a8844a322e54c2827d247f3cc7e (patch) | |
| tree | 31b9f912b4463546a3fb974c99048d0b5767eb59 /libavformat | |
| parent | 9888ffb1ce5e0a17f711b01933d504c72ea29d3b (diff) | |
| download | ffmpeg-84cc314e40dc0a8844a322e54c2827d247f3cc7e.tar.gz | |
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')
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/smoothstreamingenc.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index ae168b6ff4..53cc675324 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 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, }; |