Merge commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 23:38:50 +0000 (00:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 23:39:44 +0000 (00:39 +0100)
* commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f':
  movenc: Readd an accidentally removed condition

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/movenc.c

index 010c655..29b7a2a 100644 (file)
@@ -4166,7 +4166,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 "