Mercurial > libavformat.hg

diff oggparsespeex.c @ 5434:68c8e7affd44 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix PTS for OGM codecs. Fixes issue251
author conrad
date Sat, 12 Dec 2009 20:18:43 +0000
parents 5de92e352cf9
children e993cab1faf3
line wrap: on
line diff
--- a/oggparsespeex.c	Sat Dec 12 15:26:33 2009 +0000
+++ b/oggparsespeex.c	Sat Dec 12 20:18:43 2009 +0000
@@ -95,15 +95,16 @@
         os->private = spxp;
     }
 
-    if (os->flags & OGG_FLAG_EOS && os->lastgp != -1 && os->granule > 0) {
+    if (os->flags & OGG_FLAG_EOS && os->lastpts != AV_NOPTS_VALUE &&
+        os->granule > 0) {
         /* first packet of final page. we have to calculate the final packet
            duration here because it is the only place we know the next-to-last
            granule position. */
-        spxp->final_packet_duration = os->granule - os->lastgp -
+        spxp->final_packet_duration = os->granule - os->lastpts -
                                       packet_size * (ogg_page_packets(os) - 1);
     }
 
-    if (!os->lastgp && os->granule > 0)
+    if (!os->lastpts && os->granule > 0)
         /* first packet */
         os->pduration = os->granule - packet_size * (ogg_page_packets(os) - 1);
     else if (os->flags & OGG_FLAG_EOS && os->segp == os->nsegs &&