40 lines
1.6 KiB
Plaintext
40 lines
1.6 KiB
Plaintext
$OpenBSD: patch-modules_codec_faad_c,v 1.6 2010/05/05 08:43:35 edd Exp $
|
|
--- modules/codec/faad.c.orig Tue Oct 20 16:30:34 2009
|
|
+++ modules/codec/faad.c Sat Nov 28 16:25:46 2009
|
|
@@ -149,7 +149,7 @@ static int Open( vlc_object_t *p_this )
|
|
if( p_dec->fmt_in.i_extra > 0 )
|
|
{
|
|
/* We have a decoder config so init the handle */
|
|
- unsigned long i_rate;
|
|
+ unsigned int i_rate;
|
|
unsigned char i_channels;
|
|
|
|
if( faacDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
|
|
@@ -257,7 +257,7 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, b
|
|
if( p_dec->fmt_out.audio.i_rate == 0 && p_dec->fmt_in.i_extra > 0 )
|
|
{
|
|
/* We have a decoder config so init the handle */
|
|
- unsigned long i_rate;
|
|
+ unsigned int i_rate;
|
|
unsigned char i_channels;
|
|
|
|
if( faacDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
|
|
@@ -276,7 +276,7 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, b
|
|
|
|
if( p_dec->fmt_out.audio.i_rate == 0 && p_sys->i_buffer )
|
|
{
|
|
- unsigned long i_rate;
|
|
+ unsigned int i_rate;
|
|
unsigned char i_channels;
|
|
|
|
/* Init faad with the first frame */
|
|
@@ -379,7 +379,7 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, b
|
|
const char *psz_ext = (frame.sbr && frame.ps) ? "SBR+PS" :
|
|
frame.sbr ? "SBR" : "PS";
|
|
|
|
- msg_Dbg( p_dec, "AAC %s (channels: %u, samplerate: %lu)",
|
|
+ msg_Dbg( p_dec, "AAC %s (channels: %u, samplerate: %u)",
|
|
psz_ext, frame.channels, frame.samplerate );
|
|
|
|
if( !p_dec->p_description )
|