Mercurial > libavformat.hg

diff utils.c @ 6158:4d1d3e0ba6d7 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix failure in av_read_frame on timestamp rollover. Patch by Stephen Dredge, sdredge A tpg com au
author cehoyos
date Tue, 22 Jun 2010 08:48:28 +0000
parents 3877522243ec
children 4fc5e0e4e1cd
line wrap: on
line diff
--- a/utils.c	Mon Jun 21 19:41:02 2010 +0000
+++ b/utils.c	Tue Jun 22 08:48:28 2010 +0000
@@ -1189,11 +1189,11 @@
             AVPacket *next_pkt= &pktl->pkt;
 
             if(genpts && next_pkt->dts != AV_NOPTS_VALUE){
+                int wrap_bits = s->streams[next_pkt->stream_index]->pts_wrap_bits;
                 while(pktl && next_pkt->pts == AV_NOPTS_VALUE){
                     if(   pktl->pkt.stream_index == next_pkt->stream_index
-                       && next_pkt->dts < pktl->pkt.dts
-                       && pktl->pkt.pts != pktl->pkt.dts //not b frame
-                       /*&& pktl->pkt.dts != AV_NOPTS_VALUE*/){
+                       && (0 > av_compare_mod(next_pkt->dts, pktl->pkt.dts, 2LL << (wrap_bits - 1)))
+                       && av_compare_mod(pktl->pkt.pts, pktl->pkt.dts, 2LL << (wrap_bits - 1))) { //not b frame
                         next_pkt->pts= pktl->pkt.dts;
                     }
                     pktl= pktl->next;