diff options
| author | Martin Storsjö <martin@martin.st> | 2014-10-21 10:44:38 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2014-10-29 23:02:02 +0200 |
| commit | b2b79eca6fae2466a53c5daa163a37e2474364fc (patch) | |
| tree | 145e5a8196ef9212fc1d2569146cb9006ba2df07 | |
| parent | 573b1de2d7f1db71030f91ecdded7d0bc071f6b6 (diff) | |
| download | ffmpeg-b2b79eca6fae2466a53c5daa163a37e2474364fc.tar.gz | |
movenc: Don't check the custom IO flag when using faststart
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ö <martin@martin.st>
| -rw-r--r-- | libavformat/movenc.c | 5 |
1 files changed, 2 insertions, 3 deletions
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; } } |