[xiph-commits] r3223 - liboggz/trunk/src/liboggz

[shans at svn.annodex.net]

Author: shans
Date: 2007-09-04 18:53:26 -0700 (Tue, 04 Sep 2007)
New Revision: 3223

Modified:
   liboggz/trunk/src/liboggz/oggz_auto.c
Log:
Set last size flag correctly, removed duplicate return on valid gp



Modified: liboggz/trunk/src/liboggz/oggz_auto.c
===================================================================
--- liboggz/trunk/src/liboggz/oggz_auto.c	2007-09-04 07:46:24 UTC (rev 3222)
+++ liboggz/trunk/src/liboggz/oggz_auto.c	2007-09-05 01:53:26 UTC (rev 3223)
@@ -686,12 +686,6 @@
 
   info = (auto_calc_vorbis_info_t *)stream->calculate_data;
 
-
-  if (now > -1)
-  {
-    return now;
-  }
- 
   { 
     /*
      * we're in a data packet!  First we need to get the mode of the packet,
@@ -704,18 +698,18 @@
     mode = (op->packet[0] >> 1) & ((1 << info->log2_num_modes) - 1);
     size = info->mode_sizes[mode];
   
-    info->last_was_long = size;
-
     /*
      * if we have a working granulepos, we use it.
      */
     if (now > -1) {
       info->encountered_first_data_packet = 1;
+      info->last_was_long = size;
       return now;
     }
 
     if (info->encountered_first_data_packet == 0) {
       info->encountered_first_data_packet = 1;
+      info->last_was_long = size;
       return -1;
     }
 
@@ -724,6 +718,7 @@
      * -1
      */
     if (stream->last_granulepos == -1) {
+      info->last_was_long = size;
       return -1;
     }