From b2b79eca6fae2466a53c5daa163a37e2474364fc Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Tue, 21 Oct 2014 10:44:38 +0300 Subject: movenc: Don't check the custom IO flag when using faststart MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The custom IO flag actually never is set for muxers, only for demuxers, so the check was pointless (unless a user intentionally would set the flag to signal using custom IO). Signed-off-by: Martin Storsjö --- libavformat/movenc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'libavformat/movenc.c') diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 43b03c5325..ccd310cb03 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3437,10 +3437,9 @@ static int mov_write_header(AVFormatContext *s) /* faststart: moov at the beginning of the file, if supported */ if (mov->flags & FF_MOV_FLAG_FASTSTART) { - if ((mov->flags & FF_MOV_FLAG_FRAGMENT) || - (s->flags & AVFMT_FLAG_CUSTOM_IO)) { + if (mov->flags & FF_MOV_FLAG_FRAGMENT) { av_log(s, AV_LOG_WARNING, "The faststart flag is incompatible " - "with fragmentation and custom IO, disabling faststart\n"); + "with fragmentation, disabling faststart\n"); mov->flags &= ~FF_MOV_FLAG_FASTSTART; } } -- cgit v1.2.3