lavf: Remove codec_tag from dashenc and smoothstreamingenc
authorMartin Storsjö <martin@martin.st>
Fri, 30 Jun 2017 09:49:49 +0000 (12:49 +0300)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 4 Jul 2017 19:47:10 +0000 (15:47 -0400)
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.

(cherry picked from commit 61f589e31e84ae02d7ac6837f30f19c437b1fc2e)
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavformat/dashenc.c
libavformat/smoothstreamingenc.c

index 0f234bb..bdb332c 100644 (file)
@@ -1089,7 +1089,6 @@ AVOutputFormat ff_dash_muxer = {
     .write_packet   = dash_write_packet,
     .write_trailer  = dash_write_trailer,
     .deinit         = dash_free,
-    .codec_tag      = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 },
     .check_bitstream = dash_check_bitstream,
     .priv_class     = &dash_class,
 };
index dabd1ea..083af49 100644 (file)
@@ -647,6 +647,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,
 };