From dd32d03f3e2e7a559456676cd021b28e40570770 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 30 Mar 2006 08:47:09 +0000 Subject: Trust the demuxer instead of the decoder for samplerate detection. Fixes the ffmp3_bad_rate_detection.avi sample. patch by qwen dux qwendu__at__gmail__.__com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17996 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/ad_ffmpeg.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c index 10cb2137e1..06e7f2c2d0 100644 --- a/libmpcodecs/ad_ffmpeg.c +++ b/libmpcodecs/ad_ffmpeg.c @@ -109,15 +109,14 @@ static int init(sh_audio_t *sh_audio) x=decode_audio(sh_audio,sh_audio->a_buffer,1,sh_audio->a_buffer_size); if(x>0) sh_audio->a_buffer_len=x; -#if 1 sh_audio->channels=lavc_context->channels; sh_audio->samplerate=lavc_context->sample_rate; sh_audio->i_bps=lavc_context->bit_rate/8; -#else - sh_audio->channels=sh_audio->wf->nChannels; - sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; - sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec; -#endif + if(sh_audio->wf){ + sh_audio->channels=sh_audio->wf->nChannels; + sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; + sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec; + } sh_audio->samplesize=2; return 1; } -- cgit v1.2.3