From b362fde1e91190d1988b4a1aea7b453fe6d72bc6 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Tue, 23 Mar 2010 14:08:03 +0200 Subject: Fixed using uninitialized decode_buffer_size --- src/combined/ffmpeg/ff_audio_decoder.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/combined') diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c index 26e1ac168..125eff12c 100644 --- a/src/combined/ffmpeg/ff_audio_decoder.c +++ b/src/combined/ffmpeg/ff_audio_decoder.c @@ -285,6 +285,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) if (!this->output_open) { if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) { + decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; avcodec_decode_audio2 (this->context, (int16_t *)this->decode_buffer, &decode_buffer_size, -- cgit v1.2.3 From 0b9d995c38b188a6e1e899f43a0dc318d67099a2 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Tue, 23 Mar 2010 14:11:09 +0200 Subject: Added new audio buffer type (EAC3) --- src/combined/ffmpeg/ffmpeg_decoder.c | 3 +++ src/combined/ffmpeg/xine_audio.list | 1 + 2 files changed, 4 insertions(+) (limited to 'src/combined') diff --git a/src/combined/ffmpeg/ffmpeg_decoder.c b/src/combined/ffmpeg/ffmpeg_decoder.c index 6d0bfa432..b50633053 100644 --- a/src/combined/ffmpeg/ffmpeg_decoder.c +++ b/src/combined/ffmpeg/ffmpeg_decoder.c @@ -180,6 +180,9 @@ void avcodec_register_all(void) REGISTER_DECODER(AC3, ac3); #endif REGISTER_ENCODER(AC3, ac3); +#ifdef CODEC_ID_EAC3 + REGISTER_DECODER(EAC3, eac3); +#endif REGISTER_DECODER(ALAC, alac); #if defined(CONFIG_AMR_NB) || defined(CONFIG_AMR_NB_FIXED) REGISTER_ENCDEC (AMR_NB, amr_nb); diff --git a/src/combined/ffmpeg/xine_audio.list b/src/combined/ffmpeg/xine_audio.list index 9ec727bf1..5daa4d8b0 100644 --- a/src/combined/ffmpeg/xine_audio.list +++ b/src/combined/ffmpeg/xine_audio.list @@ -41,6 +41,7 @@ FLVADPCM ADPCM_SWF Flash ADPCM WAVPACK WAVPACK WavPack AMR_NB AMR_NB AMR narrow band AMR_WB AMR_WB AMR wide band +EAC3 EAC3 E-AC-3 # disabled codecs (ref. configure.ac) ! AAC -- cgit v1.2.3