"[PATCH] for changing the mosaic-order in execution time" by Mateus Krepsky Ludwich...

[vlc] / modules / codec / speex.c

diff --git a/modules/codec/speex.c b/modules/codec/speex.c
old mode 100755 (executable)
new mode 100644 (file)
index 2cdeb30..4e66ba7
--- a/modules/codec/speex.c
+++ b/modules/codec/speex.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * speex.c: speex decoder/packetizer/encoder module making use of libspeex.
  *****************************************************************************
- * Copyright (C) 2003 VideoLAN
+ * Copyright (C) 2003 the VideoLAN team
  * $Id$
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -99,6 +99,9 @@ static block_t *Encode   ( encoder_t *, aout_buffer_t * );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
+    set_category( CAT_INPUT );
+    set_subcategory( SUBCAT_INPUT_ACODEC );
+
     set_description( _("Speex audio decoder") );
     set_capability( "decoder", 100 );
     set_callbacks( OpenDecoder, CloseDecoder );
@@ -322,7 +325,8 @@ static int ProcessInitialHeader( decoder_t *p_dec, ogg_packet *p_oggpacket )
     SpeexCallback callback;
 
     p_sys->p_header = p_header =
-        speex_packet_to_header( p_oggpacket->packet, p_oggpacket->bytes );
+        speex_packet_to_header( (char *)p_oggpacket->packet,
+                                p_oggpacket->bytes );
     if( !p_header )
     {
         msg_Err( p_dec, "cannot read Speex header" );
@@ -340,7 +344,7 @@ static int ProcessInitialHeader( decoder_t *p_dec, ogg_packet *p_oggpacket )
     if( p_header->speex_version_id > 1 )
     {
         msg_Err( p_dec, "this file was encoded with Speex bit-stream "
-                 "version %d, which I don't know how to decode.",
+                 "version %d which is not supported by this decoder.",
                  p_header->speex_version_id );
         return VLC_EGENERIC;
     }
@@ -445,7 +449,7 @@ static aout_buffer_t *DecodePacket( decoder_t *p_dec, ogg_packet *p_oggpacket )
     if( p_oggpacket->bytes )
     {
         /* Copy Ogg packet to Speex bitstream */
-        speex_bits_read_from( &p_sys->bits, p_oggpacket->packet,
+        speex_bits_read_from( &p_sys->bits, (char *)p_oggpacket->packet,
                               p_oggpacket->bytes );
         p_sys->i_frame_in_packet = 0;
     }
@@ -710,7 +714,7 @@ static block_t *Encode( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
     encoder_sys_t *p_sys = p_enc->p_sys;
     block_t *p_block, *p_chain = NULL;
 
-    char *p_buffer = p_aout_buf->p_buffer;
+    unsigned char *p_buffer = p_aout_buf->p_buffer;
     int i_samples = p_aout_buf->i_nb_samples;
     int i_samples_delay = p_sys->i_samples_delay;