Mercurial > mplayer.hg
comparison libmpcodecs/ad_ffmpeg.c @ 20328:5d9f47834495
Do not use sh_audio->wf values if they are definitely invalid
author | reimar |
---|---|
date | Sat, 21 Oct 2006 17:01:45 +0000 |
parents | caac2ca98168 |
children | 1767c271d710 |
comparison
equal
deleted
inserted
replaced
20327:5e5e6c0a98c3 | 20328:5d9f47834495 |
---|---|
113 sh_audio->samplerate=lavc_context->sample_rate; | 113 sh_audio->samplerate=lavc_context->sample_rate; |
114 sh_audio->i_bps=lavc_context->bit_rate/8; | 114 sh_audio->i_bps=lavc_context->bit_rate/8; |
115 if(sh_audio->wf){ | 115 if(sh_audio->wf){ |
116 // If the decoder uses the wrong number of channels all is lost anyway. | 116 // If the decoder uses the wrong number of channels all is lost anyway. |
117 // sh_audio->channels=sh_audio->wf->nChannels; | 117 // sh_audio->channels=sh_audio->wf->nChannels; |
118 if (sh_audio->wf->nSamplesPerSec) | |
118 sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; | 119 sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; |
120 if (sh_audio->wf->nAvgBytesPerSec) | |
119 sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec; | 121 sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec; |
120 } | 122 } |
121 sh_audio->samplesize=2; | 123 sh_audio->samplesize=2; |
122 return 1; | 124 return 1; |
123 } | 125 } |