lavf: Remove codec_tag from dashend and smoothstreamingenc

Message ID 20170630095208.76738-1-martin@martin.st
State Committed
Commit 61f589e31e84ae02d7ac6837f30f19c437b1fc2e
Headers show

Commit Message

Martin Storsjö June 30, 2017, 9:52 a.m.
Currently, the tags enforced and set on the segmenter muxer level
mismatches what the mp4/ismv muxer uses (since 713efb2c0d013).

Skip the codec_tag altogether here, to let the user (try to) set
whichever codec/tag he wants; the individual chained muxer will
reject invalid codecs anyway.
---
 libavformat/dashenc.c            | 1 -
 libavformat/smoothstreamingenc.c | 1 -
 2 files changed, 2 deletions(-)

Comments

Diego Biurrun June 30, 2017, 10:08 a.m. | #1
On Fri, Jun 30, 2017 at 12:52:08PM +0300, Martin Storsjö wrote:
> Currently, the tags enforced and set on the segmenter muxer level
> mismatches what the mp4/ismv muxer uses (since 713efb2c0d013).

s/mismatches/mismatch/

> Skip the codec_tag altogether here, to let the user (try to) set
> whichever codec/tag he wants; the individual chained muxer will

s/he wants/is preferred/

and OK

Diego
Vittorio Giovara June 30, 2017, 3:20 p.m. | #2
nit: s/dashend/dashenc/ in the commit title

On Fri, Jun 30, 2017 at 5:52 AM, Martin Storsjö <martin@martin.st> wrote:
> Currently, the tags enforced and set on the segmenter muxer level
> mismatches what the mp4/ismv muxer uses (since 713efb2c0d013).
>
> Skip the codec_tag altogether here, to let the user (try to) set
> whichever codec/tag he wants; the individual chained muxer will
> reject invalid codecs anyway.
> ---
>  libavformat/dashenc.c            | 1 -
>  libavformat/smoothstreamingenc.c | 1 -
>  2 files changed, 2 deletions(-)

lgtm

Patch

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,
 };