mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-01-29 18:53:02 +00:00
Merge commit '521dc78366c6ea54b7b69426dab302a57231f81e'
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
commit
895b888f16
@ -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++;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user