31 lines
1.5 KiB
Plaintext
31 lines
1.5 KiB
Plaintext
$OpenBSD: patch-libmpcodecs_ad_faad_c,v 1.2 2008/09/15 22:13:02 jakemsr Exp $
|
|
--- libmpcodecs/ad_faad.c.orig Sun Oct 7 12:49:25 2007
|
|
+++ libmpcodecs/ad_faad.c Wed Jul 16 01:50:40 2008
|
|
@@ -66,7 +66,7 @@ static int aac_probe(unsigned char *buffer, int len)
|
|
|
|
static int init(sh_audio_t *sh)
|
|
{
|
|
- unsigned long faac_samplerate;
|
|
+ unsigned int faac_samplerate;
|
|
unsigned char faac_channels;
|
|
int faac_init, pos = 0;
|
|
faac_hdec = faacDecOpen();
|
|
@@ -148,7 +148,7 @@ static int init(sh_audio_t *sh)
|
|
return 0;
|
|
} else {
|
|
mp_msg(MSGT_DECAUDIO,MSGL_V,"FAAD: Decoder init done (%dBytes)!\n", sh->a_in_buffer_len); // XXX: remove or move to debug!
|
|
- mp_msg(MSGT_DECAUDIO,MSGL_V,"FAAD: Negotiated samplerate: %ldHz channels: %d\n", faac_samplerate, faac_channels);
|
|
+ mp_msg(MSGT_DECAUDIO,MSGL_V,"FAAD: Negotiated samplerate: %dHz channels: %d\n", faac_samplerate, faac_channels);
|
|
sh->channels = faac_channels;
|
|
if (audio_output_channels <= 2) sh->channels = faac_channels > 1 ? 2 : 1;
|
|
sh->samplerate = faac_samplerate;
|
|
@@ -276,7 +276,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *
|
|
} else {
|
|
/* XXX: samples already multiplied by channels! */
|
|
mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"FAAD: Successfully decoded frame (%ld Bytes)!\n",
|
|
- sh->samplesize*faac_finfo.samples);
|
|
+ (long)sh->samplesize*faac_finfo.samples);
|
|
memcpy(buf+len,faac_sample_buffer, sh->samplesize*faac_finfo.samples);
|
|
last_dec_len = sh->samplesize*faac_finfo.samples;
|
|
len += last_dec_len;
|