[FFmpeg-cvslog] movenc: Remove an unnecessary condition when flushing fragments

Martin Storsjö git at videolan.org
Sat Jan 3 01:33:29 CET 2015


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Thu Dec 18 23:59:27 2014 +0200| [724cbea7193945fe5a5b4dea8ede344803572844] | committer: Martin Storsjö

movenc: Remove an unnecessary condition when flushing fragments

If fragments == 0 it means we haven't written any moov atom yet.
If the empty_moov flag is set, we already have written an empty moov
atom at startup. Thus, the check for empty_moov is redundant.

This is in preparation for allowing writing the moov atom later,
even when using the empty moov flag.

Signed-off-by: Martin Storsjö <martin at martin.st>

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

 libavformat/movenc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 3f5a6ae..fe5f5ed 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -3089,7 +3089,7 @@ static int mov_flush_fragment(AVFormatContext *s)
     if (!(mov->flags & FF_MOV_FLAG_FRAGMENT))
         return 0;
 
-    if (!(mov->flags & FF_MOV_FLAG_EMPTY_MOOV) && mov->fragments == 0) {
+    if (mov->fragments == 0) {
         int64_t pos = avio_tell(s->pb);
         int ret;
         AVIOContext *moov_buf;



More information about the ffmpeg-cvslog mailing list