[SCM] libav/experimental: Clarify timestamps related error messages in compute_pkt_fields2().

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 440d761e40e05af4eed5fb8ceccbe50382c47465
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Tue Jan 11 12:17:27 2011 +0000

    Clarify timestamps related error messages in compute_pkt_fields2().
    
    Originally committed as revision 26308 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 32067e9..c208bd9 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2917,12 +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,
-               "st:%d error, non monotone timestamps %"PRId64" >= %"PRId64"\n",
+               "Application provided invalid, non monotonically increasing dts to muxer in stream %d: %"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, "st:%d error, pts < dts\n", st->index);
+        av_log(s, AV_LOG_ERROR, "pts < dts in stream %d\n", st->index);
         return -1;
     }
 

-- 
Libav/FFmpeg packaging