Mercurial > mplayer.hg
comparison libmpdemux/demux_lavf.c @ 16135:7457c791204e
Hopefully finally fix the last commit
author | reimar |
---|---|
date | Thu, 28 Jul 2005 14:14:13 +0000 |
parents | a1fd1a7eeb35 |
children | 6b86089c2edd |
comparison
equal
deleted
inserted
replaced
16134:a1fd1a7eeb35 | 16135:7457c791204e |
---|---|
219 sh_audio->i_bps= codec->bit_rate/8; | 219 sh_audio->i_bps= codec->bit_rate/8; |
220 switch (codec->codec_id) { | 220 switch (codec->codec_id) { |
221 case CODEC_ID_PCM_S8: | 221 case CODEC_ID_PCM_S8: |
222 case CODEC_ID_PCM_U8: | 222 case CODEC_ID_PCM_U8: |
223 sh_audio->samplesize = 1; | 223 sh_audio->samplesize = 1; |
224 break; | |
224 case CODEC_ID_PCM_S16LE: | 225 case CODEC_ID_PCM_S16LE: |
225 case CODEC_ID_PCM_S16BE: | 226 case CODEC_ID_PCM_S16BE: |
226 case CODEC_ID_PCM_U16LE: | 227 case CODEC_ID_PCM_U16LE: |
227 case CODEC_ID_PCM_U16BE: | 228 case CODEC_ID_PCM_U16BE: |
228 sh_audio->samplesize = 2; | 229 sh_audio->samplesize = 2; |
230 break; | |
231 case CODEC_ID_PCM_ALAW: | |
232 sh_audio->format = 0x6; | |
233 break; | |
234 case CODEC_ID_PCM_MULAW: | |
235 sh_audio->format = 0x7; | |
236 break; | |
229 } | 237 } |
230 if(verbose>=1) print_wave_header(sh_audio->wf); | 238 if(verbose>=1) print_wave_header(sh_audio->wf); |
231 if(demuxer->audio->id != i && demuxer->audio->id != -1) | 239 if(demuxer->audio->id != i && demuxer->audio->id != -1) |
232 st->discard= AVDISCARD_ALL; | 240 st->discard= AVDISCARD_ALL; |
233 else{ | 241 else{ |