diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 16:56:22 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 16:56:22 +0000 |
| commit | 895b888f1606eb734c9ad16862c205a260cf622c (patch) | |
| tree | f694cf40b46dff7cddf70ee1fc3f3c75a37397ab | |
| parent | e5fe75ae2bd47b7f6aa14c87f4d7c6ec4262c2cb (diff) | |
| parent | 521dc78366c6ea54b7b69426dab302a57231f81e (diff) | |
Merge commit '521dc78366c6ea54b7b69426dab302a57231f81e'
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | libavformat/mux.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index cf1fb5cc32..789c811cd8 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -365,12 +365,6 @@ FF_ENABLE_DEPRECATION_WARNINGS codec->codec_tag = av_codec_get_tag(of->codec_tag, codec->codec_id); } - if (of->flags & AVFMT_GLOBALHEADER && - !(codec->flags & AV_CODEC_FLAG_GLOBAL_HEADER)) - av_log(s, AV_LOG_WARNING, - "Codec for stream %d does not use global headers " - "but container format requires global headers\n", i); - if (codec->codec_type != AVMEDIA_TYPE_ATTACHMENT) s->internal->nb_interleaved_streams++; } |