[xiph-commits] r11409 - trunk/xiph-qt/OggImport/src

[arek at svn.xiph.org]

Author: arek
Date: 2006-05-17 06:01:01 -0700 (Wed, 17 May 2006)
New Revision: 11409

Modified:
   trunk/xiph-qt/OggImport/src/stream_flac.c
   trunk/xiph-qt/OggImport/src/stream_speex.c
   trunk/xiph-qt/OggImport/src/stream_theora.c
   trunk/xiph-qt/OggImport/src/stream_vorbis.c
Log:
Added (granpos == -1) check. Fixes #912.

Modified: trunk/xiph-qt/OggImport/src/stream_flac.c
===================================================================
--- trunk/xiph-qt/OggImport/src/stream_flac.c	2006-05-16 15:12:29 UTC (rev 11408)
+++ trunk/xiph-qt/OggImport/src/stream_flac.c	2006-05-17 13:01:01 UTC (rev 11409)
@@ -367,7 +367,8 @@
                     movie_changed = true;
                 }
 
-                si->lastGranulePos = pos;
+                if (pos != -1)
+                    si->lastGranulePos = pos;
             }
             loop = false;
             break;

Modified: trunk/xiph-qt/OggImport/src/stream_speex.c
===================================================================
--- trunk/xiph-qt/OggImport/src/stream_speex.c	2006-05-16 15:12:29 UTC (rev 11408)
+++ trunk/xiph-qt/OggImport/src/stream_speex.c	2006-05-17 13:01:01 UTC (rev 11409)
@@ -331,7 +331,8 @@
                     movie_changed = true;
                 }
 
-                si->lastGranulePos = pos;
+                if (pos != -1)
+                    si->lastGranulePos = pos;
             }
             loop = false;
             break;

Modified: trunk/xiph-qt/OggImport/src/stream_theora.c
===================================================================
--- trunk/xiph-qt/OggImport/src/stream_theora.c	2006-05-16 15:12:29 UTC (rev 11408)
+++ trunk/xiph-qt/OggImport/src/stream_theora.c	2006-05-17 13:01:01 UTC (rev 11409)
@@ -535,7 +535,8 @@
                     movie_changed = true;
                 }
                 
-                si->lastGranulePos = pos;
+                if (pos != -1)
+                    si->lastGranulePos = pos;
             }
             loop = false;
             break;

Modified: trunk/xiph-qt/OggImport/src/stream_vorbis.c
===================================================================
--- trunk/xiph-qt/OggImport/src/stream_vorbis.c	2006-05-16 15:12:29 UTC (rev 11408)
+++ trunk/xiph-qt/OggImport/src/stream_vorbis.c	2006-05-17 13:01:01 UTC (rev 11409)
@@ -353,7 +353,8 @@
                     movie_changed = true;
                 }
 
-                si->lastGranulePos = pos;
+                if (pos != -1)
+                    si->lastGranulePos = pos;
             }
             loop = false;
             break;