Merge commit '897d5c3a4296f3da80b8699d1487328ca2de8e55'

* commit '897d5c3a4296f3da80b8699d1487328ca2de8e55':
  lavf: Print a warning if failed to avoid negative timestamps when requested

Conflicts:
	libavformat/mux.c

See: ec6a5fc6cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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
             );