[FFmpeg-cvslog] movenc: Readd an accidentally removed condition

Martin Storsjö git at videolan.org
Wed Jan 7 00:46:55 CET 2015


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Mon Jan  5 15:07:01 2015 +0200| [e581e88cbdb3323ca0026a54b39a9716a3686e9f] | committer: Martin Storsjö

movenc: Readd an accidentally removed condition

This was removed accidentally as part of 847bf598. This could cause
groundless warning logging.

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

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

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

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 72da010..58ff6ad 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -3372,7 +3372,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
             trk->frag_start   = pkt->dts;
             trk->start_dts    = 0;
             trk->frag_discont = 0;
-        } else if (mov->fragments >= 1)
+        } else if (pkt->dts && mov->fragments >= 1)
             av_log(s, AV_LOG_WARNING,
                    "Track %d starts with a nonzero dts %"PRId64", while the moov "
                    "already has been written. Set the delay_moov flag to handle "



More information about the ffmpeg-cvslog mailing list