OSDN Git Service

movenc: Readd an accidentally removed condition
authorMartin Storsjö <martin@martin.st>
Mon, 5 Jan 2015 13:07:01 +0000 (15:07 +0200)
committerMartin Storsjö <martin@martin.st>
Tue, 6 Jan 2015 17:47:09 +0000 (19:47 +0200)
This was removed accidentally as part of 847bf598. This could cause
groundless warning logging.

Signed-off-by: Martin Storsjö <martin@martin.st>
libavformat/movenc.c

index 72da010..58ff6ad 100644 (file)
@@ -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 "