fix flac demuxer content detection. it was eating 4 bytes of non-seekable

streams, therefore playing of mms streams failed.

CVS patchset: 4061
CVS date: 2003/01/31 15:51:10

1 files changed, 17 insertions, 17 deletions

diff --git a/src/libflac/decoder_flac.c b/src/libflac/decoder_flac.c
index 36278df12..508b30d56 100644
--- a/src/libflac/decoder_flac.c
+++ b/src/libflac/decoder_flac.c
@@ -81,7 +81,7 @@ flac_read_callback (const FLAC__StreamDecoder *decoder,
     int number_of_bytes_to_copy;
 
 #ifdef LOG
-    printf("FLAC_DEC: flac_read_callback: %d\n", *bytes);
+    printf("libflac: flac_read_callback: %d\n", *bytes);
 #endif
 
     if (this->buf_pos > *bytes)
@@ -90,7 +90,7 @@ flac_read_callback (const FLAC__StreamDecoder *decoder,
         number_of_bytes_to_copy = this->buf_pos;
 
 #ifdef LOG
-    printf("FLAC_DEC: number_of_bytes_to_copy: %d\n", number_of_bytes_to_copy);
+    printf("libflac: number_of_bytes_to_copy: %d\n", number_of_bytes_to_copy);
 #endif
 
     *bytes = number_of_bytes_to_copy;
@@ -122,7 +122,7 @@ flac_write_callback (const FLAC__StreamDecoder *decoder,
     int i,j;
 
 #ifdef LOG
-    printf("FLAC_DEC: flac_write_callback\n");
+    printf("libflac: flac_write_callback\n");
 #endif
 
     while( samples_left ) {
@@ -169,15 +169,15 @@ flac_metadata_callback (const FLAC__StreamDecoder *decoder,
     flac_decoder_t *this = (flac_decoder_t *)client_data;
   
 #ifdef LOG
-    printf("FLAC_DEC: Metadata callback called!\n");
+    printf("libflac: Metadata callback called!\n");
 #endif
        
     if (metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
 #ifdef LOG
-      printf("FLAC_DEC: min_blocksize = %d\n", metadata->data.stream_info.min_blocksize);
-      printf("FLAC_DEC: max_blocksize = %d\n", metadata->data.stream_info.max_blocksize);
-      printf("FLAC_DEC: min_framesize = %d\n", metadata->data.stream_info.min_framesize);
-      printf("FLAC_DEC: max_framesize = %d\n", metadata->data.stream_info.max_framesize);
+      printf("libflac: min_blocksize = %d\n", metadata->data.stream_info.min_blocksize);
+      printf("libflac: max_blocksize = %d\n", metadata->data.stream_info.max_blocksize);
+      printf("libflac: min_framesize = %d\n", metadata->data.stream_info.min_framesize);
+      printf("libflac: max_framesize = %d\n", metadata->data.stream_info.max_framesize);
 #endif
       
       /* does not work well:
@@ -193,16 +193,16 @@ flac_error_callback (const FLAC__StreamDecoder *decoder,
 {
     /* This will be called if there is an error in the flac stream */
 #ifdef LOG
-    printf("FLAC_DEC: flac_error_callback\n");
+    printf("libflac: flac_error_callback\n");
 
     if (status == FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC)
-        printf("FLAC_DEC: Decoder lost synchronization.\n");
+        printf("libflac: Decoder lost synchronization.\n");
     else if (status == FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER)
-        printf("FLAC_DEC: Decoder encounted a corrupted frame header.\n");
+        printf("libflac: Decoder encounted a corrupted frame header.\n");
     else if (status == FLAC__STREAM_DECODER_ERROR_STATUS_FRAME_CRC_MISMATCH)
-        printf("FLAC_DEC: Frame's data did not match the CRC in the footer.\n");
+        printf("libflac: Frame's data did not match the CRC in the footer.\n");
     else
-        printf("FLAC_DEC: unknown error.\n");
+        printf("libflac: unknown error.\n");
 #endif
                                                                                 
     return;
@@ -234,7 +234,7 @@ flac_discontinuity (audio_decoder_t *this_gen)
 
   this->pts = 0;
 #ifdef LOG
-  printf("FLAC_DEC: Discontinuity!\n");
+  printf("libflac: Discontinuity!\n");
 #endif
 }
 
@@ -298,7 +298,7 @@ flac_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
             this->buf_size += 2 * buf->size;
             this->buf = realloc (this->buf, this->buf_size);
 #ifdef LOG
-            printf("FLAC_DEC: reallocating buffer to %d\n", this->buf_size);
+            printf("libflac: reallocating buffer to %d\n", this->buf_size);
 #endif
         }
 
@@ -314,12 +314,12 @@ flac_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
             if( FLAC__stream_decoder_get_state(this->flac_decoder) == 
                 FLAC__STREAM_DECODER_SEARCH_FOR_METADATA ) {
 #ifdef LOG
-              printf("FLAC_DEC: process_until_end_of_metadata\n");
+              printf("libflac: process_until_end_of_metadata\n");
 #endif
               ret = FLAC__stream_decoder_process_until_end_of_metadata (this->flac_decoder);
             } else {
 #ifdef LOG
-              printf("FLAC_DEC: process_single\n");
+              printf("libflac: process_single\n");
 #endif
               ret = FLAC__stream_decoder_process_single (this->flac_decoder);
             }