RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert previous commit, as it was not meant to be pushed. 

Originally committed as revision 26239 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2011-01-06 01:11:57 +00:00
parent 7820147e6f
commit 6bbdba08c2
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/utils.c
View File

@ -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){ if(st->cur_dts && st->cur_dts != AV_NOPTS_VALUE && st->cur_dts >= pkt->dts){
av_log(s, AV_LOG_ERROR, 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); st->index, st->cur_dts, pkt->dts);
return -1; return -1;
} }
if(pkt->dts != AV_NOPTS_VALUE && pkt->pts != AV_NOPTS_VALUE && pkt->pts < pkt->dts){ if(pkt->dts != AV_NOPTS_VALUE && pkt->pts != AV_NOPTS_VALUE && pkt->pts < pkt->dts){
av_log(s, AV_LOG_ERROR, av_log(s, AV_LOG_ERROR, "st:%d error, pts < dts\n", st->index);
"pts < dts in stream number %d\n: pkt->pts:%"PRId64" < pkt->dts:%"PRId64"\n",
st->index, pkt->pts, pkt->dts);
return -1; return -1;
} }