[FFmpeg-cvslog] movenc: Don't check the custom IO flag when using faststart

Martin Storsjö git at videolan.org
Thu Oct 30 02:36:39 CET 2014


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Tue Oct 21 10:44:38 2014 +0300| [b2b79eca6fae2466a53c5daa163a37e2474364fc] | committer: Martin Storsjö

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 at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b2b79eca6fae2466a53c5daa163a37e2474364fc
---

 libavformat/movenc.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 43b03c5..ccd310c 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;
         }
     }



More information about the ffmpeg-cvslog mailing list