diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-21 17:01:45 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-21 17:01:45 +0000 |
commit | e9e5d67d19ed39c8f0e0ec7318c2fcfee586ae5b (patch) | |
tree | 851033a8f605a5c10d27b06bd0df8c89f795cdcb /libmpcodecs/ad_ffmpeg.c | |
parent | 275e142fa7dd85b1cb71838b89a203901c2d4159 (diff) | |
download | mpv-e9e5d67d19ed39c8f0e0ec7318c2fcfee586ae5b.tar.bz2 mpv-e9e5d67d19ed39c8f0e0ec7318c2fcfee586ae5b.tar.xz |
Do not use sh_audio->wf values if they are definitely invalid
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20334 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/ad_ffmpeg.c')
-rw-r--r-- | libmpcodecs/ad_ffmpeg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c index f9fb0455a6..20ef2f2e53 100644 --- a/libmpcodecs/ad_ffmpeg.c +++ b/libmpcodecs/ad_ffmpeg.c @@ -115,7 +115,9 @@ static int init(sh_audio_t *sh_audio) if(sh_audio->wf){ // If the decoder uses the wrong number of channels all is lost anyway. // sh_audio->channels=sh_audio->wf->nChannels; + if (sh_audio->wf->nSamplesPerSec) sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; + if (sh_audio->wf->nAvgBytesPerSec) sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec; } sh_audio->samplesize=2; |