diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-30 02:24:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-30 02:25:02 +0100 |
| commit | 39cce77faf156644681b9816b66c36b85a33c575 (patch) | |
| tree | d0f740f624ed7b416c46ded953eb27e83b051808 /libavformat/movenc.c | |
| parent | 647405d1110cb083e96d892646d2d1367946e39a (diff) | |
| parent | b2b79eca6fae2466a53c5daa163a37e2474364fc (diff) | |
Merge commit 'b2b79eca6fae2466a53c5daa163a37e2474364fc'
* commit 'b2b79eca6fae2466a53c5daa163a37e2474364fc':
movenc: Don't check the custom IO flag when using faststart
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/movenc.c')
| -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 68b3d74ef8..ba3c90453d 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -4357,10 +4357,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; } else mov->reserved_moov_size = -1; |