diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-07 00:38:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-07 00:39:44 +0100 |
| commit | 0d0a905152f6792901551bf3be39a38b38a36656 (patch) | |
| tree | a4bb3d18da665b468cd07e882c6e530c0abae6a8 /libavformat | |
| parent | 4009ee3eccac686ee2f01837cc8877012c47314c (diff) | |
| parent | e581e88cbdb3323ca0026a54b39a9716a3686e9f (diff) | |
| download | ffmpeg-streaming-0d0a905152f6792901551bf3be39a38b38a36656.zip ffmpeg-streaming-0d0a905152f6792901551bf3be39a38b38a36656.tar.gz | |
Merge commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f'
* commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f':
movenc: Readd an accidentally removed condition
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/movenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 010c655..29b7a2a 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -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 " |
