diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-13 01:10:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-13 01:10:13 +0200 |
| commit | 20a66868a25bf7719e73ba7c6bbbe59a0f7f77b7 (patch) | |
| tree | 921f790635d6f0e92a209dad1a016eeef072b7c5 | |
| parent | ca5a77191b79e8ff46402e2db6f1bf18d034f9e8 (diff) | |
| parent | dad12ce452a9d69c0d9d53c375003947d5f1b02e (diff) | |
| download | ffmpeg-20a66868a25bf7719e73ba7c6bbbe59a0f7f77b7.tar.gz | |
Merge commit 'dad12ce452a9d69c0d9d53c375003947d5f1b02e'
* 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>
| -rw-r--r-- | libavformat/movenc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 9140411b29..8ca161f959 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -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; |