diff options
author | Martin Storsjö <martin@martin.st> | 2017-06-30 12:49:49 +0300 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2017-07-04 15:47:10 -0400 |
commit | d086e40459abe96a0765ee7f29fc297bf446135d (patch) | |
tree | e33727de3c0ee66cf3ecdc145422aff2835e31f8 /libavformat | |
parent | d32a6c36e44c4c543786922f5876372662c340e3 (diff) | |
download | ffmpeg-streaming-d086e40459abe96a0765ee7f29fc297bf446135d.zip ffmpeg-streaming-d086e40459abe96a0765ee7f29fc297bf446135d.tar.gz |
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.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/dashenc.c | 1 | ||||
-rw-r--r-- | libavformat/smoothstreamingenc.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 0f234bb..bdb332c 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 dabd1ea..083af49 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, }; |