diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-07 23:19:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-07 23:22:10 +0100 |
| commit | 0d71e825dbb36a61c47a9f7847fa240700791430 (patch) | |
| tree | 75fa873a2bab642b075f702e9c15ca6d946eaa2b | |
| parent | 66e49ff3b923c6feee8e6e3d73ae3c76708aa5f2 (diff) | |
| parent | 897d5c3a4296f3da80b8699d1487328ca2de8e55 (diff) | |
| download | ffmpeg-0d71e825dbb36a61c47a9f7847fa240700791430.tar.gz | |
Merge commit '897d5c3a4296f3da80b8699d1487328ca2de8e55'
* commit '897d5c3a4296f3da80b8699d1487328ca2de8e55':
lavf: Print a warning if failed to avoid negative timestamps when requested
Conflicts:
libavformat/mux.c
See: ec6a5fc6cca22e4eb0a91cc8fba786d41ade2032
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mux.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index 8c3360ad92..3fb4a012cf 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -579,8 +579,9 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) av_assert2(pkt->dts == AV_NOPTS_VALUE || pkt->dts >= 0 || s->max_interleave_delta > 0); if (pkt->dts != AV_NOPTS_VALUE && pkt->dts < 0) { av_log(s, AV_LOG_WARNING, - "Packets poorly interleaved, failed to avoid negative timestamp %s in stream %d\n" - "try -max_interleave_delta 0 as a possible workaround\n", + "Packets poorly interleaved, failed to avoid negative " + "timestamp %s in stream %d.\n" + "Try -max_interleave_delta 0 as a possible workaround.\n", av_ts2str(pkt->dts), pkt->stream_index ); |