virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

movenc: Don't check the custom IO flag when using faststart

Browse Source 
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>
This commit is contained in:
Martin Storsjö
2014-10-21 10:44:38 +03:00
parent 573b1de2d7
commit b2b79eca6f
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/movenc.c
View File

@@ -3437,10 +3437,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;
} }
} }