Changeset 3223

Show
Ignore:
Timestamp:
2007-09-04 18:53:26 (1 year ago)
Author:
shans
Message:

Set last size flag correctly, removed duplicate return on valid gp

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • liboggz/trunk/src/liboggz/oggz_auto.c

    r3222 r3223  
    687687  info = (auto_calc_vorbis_info_t *)stream->calculate_data; 
    688688 
    689  
    690   if (now > -1) 
    691   { 
    692     return now; 
    693   } 
    694   
    695689  {  
    696690    /* 
     
    705699    size = info->mode_sizes[mode]; 
    706700   
    707     info->last_was_long = size; 
    708  
    709701    /* 
    710702     * if we have a working granulepos, we use it. 
     
    712704    if (now > -1) { 
    713705      info->encountered_first_data_packet = 1; 
     706      info->last_was_long = size; 
    714707      return now; 
    715708    } 
     
    717710    if (info->encountered_first_data_packet == 0) { 
    718711      info->encountered_first_data_packet = 1; 
     712      info->last_was_long = size; 
    719713      return -1; 
    720714    } 
     
    725719     */ 
    726720    if (stream->last_granulepos == -1) { 
     721      info->last_was_long = size; 
    727722      return -1; 
    728723    }