ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-21 13:56:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f'

Browse Source 
* commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f':
  movenc: Readd an accidentally removed condition

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-07 00:38:50 +01:00
commit 0d0a905152
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/movenc.c
View 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 "