From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 10 Oct 2014 18:34:14 +0000 (+0200)
Subject: Merge commit 'eb4f9069002e73648f6640cd054fc814cfda75b8'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=fc6aa304596bba3837e1026fe1fb6abba1295ab5;p=ffmpeg

Merge commit 'eb4f9069002e73648f6640cd054fc814cfda75b8'

* commit 'eb4f9069002e73648f6640cd054fc814cfda75b8':
  lavf: More informative error message

Conflicts:
	libavformat/mux.c

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

fc6aa304596bba3837e1026fe1fb6abba1295ab5
diff --cc libavformat/mux.c
index 21e6a077237,3b11e4e9384..3c4853594ca
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@@ -496,8 -294,10 +496,10 @@@ static int compute_pkt_fields2(AVFormat
          return AVERROR(EINVAL);
      }
      if (pkt->dts != AV_NOPTS_VALUE && pkt->pts != AV_NOPTS_VALUE && pkt->pts < pkt->dts) {
-         av_log(s, AV_LOG_ERROR, "pts (%s) < dts (%s) in stream %d\n",
-                av_ts2str(pkt->pts), av_ts2str(pkt->dts), st->index);
+         av_log(s, AV_LOG_ERROR,
 -               "pts %" PRId64 " < dts %" PRId64 " in stream %d\n",
 -               pkt->pts, pkt->dts,
++               "pts (%s) < dts (%s) in stream %d\n",
++               av_ts2str(pkt->pts), av_ts2str(pkt->dts),
+                st->index);
          return AVERROR(EINVAL);
      }