Some quick fixes for FLAC 1.0.4

Original commit message from CVS:
Some quick fixes for FLAC 1.0.4

diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c
index 09e53041df5c696b855c1f2aaf8be96b0214149c..ac939c36160db4314c6c61bf1aab0f34ddacf984 100644 (file)
--- a/ext/flac/gstflacdec.c
+++ b/ext/flac/gstflacdec.c
@@ -435,7 +435,7 @@ gst_flacdec_loop (GstElement *element)
 
   if (flacdec->init) {
     FLAC__seekable_stream_decoder_init (flacdec->decoder);
 
   if (flacdec->init) {
     FLAC__seekable_stream_decoder_init (flacdec->decoder);

-    FLAC__seekable_stream_decoder_process_metadata (flacdec->decoder);
+    //FLAC__seekable_stream_decoder_process_metadata (flacdec->decoder);

     flacdec->init = FALSE;
   }
 
     flacdec->init = FALSE;
   }
 


@@ -455,7 +455,7 @@ gst_flacdec_loop (GstElement *element)
     flacdec->seek_pending = FALSE;
   }
 
     flacdec->seek_pending = FALSE;
   }
 

-  res = FLAC__seekable_stream_decoder_process_one_frame (flacdec->decoder);
+  res = FLAC__seekable_stream_decoder_process_single (flacdec->decoder);

   if (FLAC__seekable_stream_decoder_get_state (flacdec->decoder) == 
                  FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM) 
   {
   if (FLAC__seekable_stream_decoder_get_state (flacdec->decoder) == 
                  FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM) 
   {

diff --git a/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c
index 40eeb196264b926fc9d922eb391b30933174a558..3316232c43ebc0fd119ed205387d17cf572d7834 100644 (file)
--- a/ext/flac/gstflacenc.c
+++ b/ext/flac/gstflacenc.c
@@ -372,7 +372,7 @@ gst_flacenc_write_callback (const FLAC__StreamEncoder *encoder,
   flacenc = GST_FLACENC (client_data);
 
   if (flacenc->stopped) 
   flacenc = GST_FLACENC (client_data);
 
   if (flacenc->stopped) 

-    return FLAC__STREAM_ENCODER_WRITE_OK;
+    return FLAC__STREAM_ENCODER_OK;

 
   outbuf = gst_buffer_new_and_alloc (bytes);
 
 
   outbuf = gst_buffer_new_and_alloc (bytes);
 


@@ -386,7 +386,7 @@ gst_flacenc_write_callback (const FLAC__StreamEncoder *encoder,
 
   gst_pad_push (flacenc->srcpad, outbuf);
 
 
   gst_pad_push (flacenc->srcpad, outbuf);
 

-  return FLAC__STREAM_ENCODER_WRITE_OK;
+  return FLAC__STREAM_ENCODER_OK;

 }
 
 static void 
 }
 
 static void