diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-08-01 09:01:28 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-08-01 09:01:28 +0000 |
| commit | 483453ff8bdd3a02f56b65ee5601da8a9544d49c (patch) | |
| tree | 46cb7046b40579a395a663784835559fbc646b14 /libmpdemux | |
| parent | 1a5e937fc9d043c4c52c253f30156ac0975fbc12 (diff) | |
| download | mpv-483453ff8bdd3a02f56b65ee5601da8a9544d49c.tar.bz2 mpv-483453ff8bdd3a02f56b65ee5601da8a9544d49c.tar.xz | |
Fix detection of xan audio. -noidx or -forceidx still is necessary
to detect audio at all.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23985 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/aviheader.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c index aa31363c82..d47013fb59 100644 --- a/libmpdemux/aviheader.c +++ b/libmpdemux/aviheader.c @@ -64,6 +64,7 @@ while(1){ int id=stream_read_dword_le(demuxer->stream); unsigned chunksize,size2; static int last_fccType=0; + static int last_fccHandler=0; char* hdr=NULL; // if(stream_eof(demuxer->stream)) break; @@ -203,6 +204,7 @@ while(1){ sh_audio->stream_delay = (float)sh_audio->audio.dwStart * sh_audio->audio.dwScale/sh_audio->audio.dwRate; } last_fccType=h.fccType; + last_fccHandler=h.fccHandler; if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_strh(&h,MSGL_V); break; } case mmioFOURCC('i', 'n', 'd', 'x'): { @@ -323,6 +325,9 @@ while(1){ sh_audio->wf=realloc(sh_audio->wf, sizeof(WAVEFORMATEX)+sh_audio->wf->cbSize); } sh_audio->format=sh_audio->wf->wFormatTag; + if (sh_audio->format == 1 && + last_fccHandler == mmioFOURCC('A', 'x', 'a', 'n')) + sh_audio->format = last_fccHandler; sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec; chunksize=0; if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_audio->wf,MSGL_V); |