From 6bbdba08c277fd63cb9349876e7377a2b53f5b89 Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Thu, 6 Jan 2011 01:11:57 +0000
Subject: [PATCH] Revert previous commit, as it was not meant to be pushed.
Originally committed as revision 26239 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/utils.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 3b1b34e692d..fb93e3b57ca 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2917,14 +2917,12 @@ static int compute_pkt_fields2(AVFormatContext *s, AVStream *st, AVPacket *pkt){
if(st->cur_dts && st->cur_dts != AV_NOPTS_VALUE && st->cur_dts >= pkt->dts){
av_log(s, AV_LOG_ERROR,
- "Non monotone timestamps in stream number %d: st->cur_dts:%"PRId64" >= pkt->dts:%"PRId64"\n",
+ "st:%d error, non monotone timestamps %"PRId64" >= %"PRId64"\n",
st->index, st->cur_dts, pkt->dts);
return -1;
}
if(pkt->dts != AV_NOPTS_VALUE && pkt->pts != AV_NOPTS_VALUE && pkt->pts < pkt->dts){
- av_log(s, AV_LOG_ERROR,
- "pts < dts in stream number %d\n: pkt->pts:%"PRId64" < pkt->dts:%"PRId64"\n",
- st->index, pkt->pts, pkt->dts);
+ av_log(s, AV_LOG_ERROR, "st:%d error, pts < dts\n", st->index);
return -1;
}
--
GitLab