Commit 39cce77f authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'b2b79eca'

* commit 'b2b79eca':
  movenc: Don't check the custom IO flag when using faststart
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 647405d1 b2b79eca
...@@ -4357,10 +4357,9 @@ static int mov_write_header(AVFormatContext *s) ...@@ -4357,10 +4357,9 @@ static int mov_write_header(AVFormatContext *s)
/* faststart: moov at the beginning of the file, if supported */ /* faststart: moov at the beginning of the file, if supported */
if (mov->flags & FF_MOV_FLAG_FASTSTART) { if (mov->flags & FF_MOV_FLAG_FASTSTART) {
if ((mov->flags & FF_MOV_FLAG_FRAGMENT) || if (mov->flags & FF_MOV_FLAG_FRAGMENT) {
(s->flags & AVFMT_FLAG_CUSTOM_IO)) {
av_log(s, AV_LOG_WARNING, "The faststart flag is incompatible " 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; mov->flags &= ~FF_MOV_FLAG_FASTSTART;
} else } else
mov->reserved_moov_size = -1; mov->reserved_moov_size = -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment