virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'dad12ce452a9d69c0d9d53c375003947d5f1b02e'

Browse Source 
* commit 'dad12ce452a9d69c0d9d53c375003947d5f1b02e':
  movenc: Print a warning for an unhandled case of nonzero start dts with empty_moov

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-13 01:10:13 +02:00
commit 20a66868a2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/movenc.c
View File

@ -3849,8 +3849,14 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
if (!trk->entry && trk->start_dts == AV_NOPTS_VALUE && !supports_edts(mov)) {
trk->cluster[trk->entry].dts = trk->start_dts = 0;
}
if (trk->start_dts == AV_NOPTS_VALUE)
if (trk->start_dts == AV_NOPTS_VALUE) {
trk->start_dts = pkt->dts;
if (pkt->dts && mov->flags & FF_MOV_FLAG_EMPTY_MOOV)
av_log(s, AV_LOG_WARNING,
"Track %d starts with a nonzero dts %"PRId64". This "
"currently isn't handled correctly in combination with "
"empty_moov.\n", pkt->stream_index, pkt->dts);
}
trk->track_duration = pkt->dts - trk->start_dts + pkt->duration;
trk->last_sample_is_subtitle_end = 0;