Mercurial > mplayer.hg

comparison libmpdemux/asfheader.c @ 32597:627c9e32c3f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move setup of sh_audio->format to a more appropriate place (in asfheader.c).
author reimar
date Sat, 11 Dec 2010 15:43:24 +0000
parents 8fa2f43cb760
children f418c82bd502
comparison
equal deleted inserted replaced
32596:7f521af5122f 32597:627c9e32c3f2
346 int pos = *ppos; 346 int pos = *ppos;
347 347
348 sh_audio->wf=calloc((streamh->type_size<sizeof(*sh_audio->wf))?sizeof(*sh_audio->wf):streamh->type_size,1); 348 sh_audio->wf=calloc((streamh->type_size<sizeof(*sh_audio->wf))?sizeof(*sh_audio->wf):streamh->type_size,1);
349 memcpy(sh_audio->wf,buffer,streamh->type_size); 349 memcpy(sh_audio->wf,buffer,streamh->type_size);
350 le2me_WAVEFORMATEX(sh_audio->wf); 350 le2me_WAVEFORMATEX(sh_audio->wf);
351 sh_audio->format=sh_audio->wf->wFormatTag;
351 if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_audio->wf,MSGL_V); 352 if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_audio->wf,MSGL_V);
352 if(ASF_LOAD_GUID_PREFIX(streamh->concealment)==ASF_GUID_PREFIX_audio_conceal_interleave){ 353 if(ASF_LOAD_GUID_PREFIX(streamh->concealment)==ASF_GUID_PREFIX_audio_conceal_interleave){
353 buffer = &hdr[pos]; 354 buffer = &hdr[pos];
354 pos += streamh->stream_size; 355 pos += streamh->stream_size;
355 if (pos > hdr_len) return 0; 356 if (pos > hdr_len) return 0;