ffmpeg | branch: master | Martin Storsjö <mar...@martin.st> | Fri Jun 30 
12:49:49 2017 +0300| [d086e40459abe96a0765ee7f29fc297bf446135d] | committer: 
Derek Buitenhuis

lavf: Remove codec_tag from dashenc and smoothstreamingenc

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.buitenh...@gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d086e40459abe96a0765ee7f29fc297bf446135d
---

 libavformat/dashenc.c            | 1 -
 libavformat/smoothstreamingenc.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c
index 0f234bb0b5..bdb332c71a 100644
--- a/libavformat/dashenc.c
+++ b/libavformat/dashenc.c
@@ -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,
 };
diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c
index dabd1ea304..083af49212 100644
--- a/libavformat/smoothstreamingenc.c
+++ b/libavformat/smoothstreamingenc.c
@@ -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,
 };

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to