From 61f589e31e84ae02d7ac6837f30f19c437b1fc2e Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Fri, 30 Jun 2017 12:49:49 +0300 Subject: lavf: Remove codec_tag from dashenc and smoothstreamingenc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently, the tags enforced and set on the segmenter muxer level mismatch what the mp4/ismv muxer uses (since 713efb2c0d013). Skip the codec_tag altogether here, to let the user (try to) set whichever codec/tag is preferred; the individual chained muxer will reject invalid codecs anyway. Signed-off-by: Martin Storsjö --- libavformat/dashenc.c | 1 - libavformat/smoothstreamingenc.c | 1 - 2 files changed, 2 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 7134af4978..336cea24ec 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1272,6 +1272,5 @@ AVOutputFormat ff_dash_muxer = { .write_header = dash_write_header, .write_packet = dash_write_packet, .write_trailer = dash_write_trailer, - .codec_tag = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 }, .priv_class = &dash_class, }; diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c index 997b9e636c..9a6682465b 100644 --- a/libavformat/smoothstreamingenc.c +++ b/libavformat/smoothstreamingenc.c @@ -662,6 +662,5 @@ 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, }; -- cgit v1.2.3