diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-11-21 12:25:44 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-12-16 04:23:53 +0200 |
| commit | 5e6c4de69e157301204a543b108b40d513983e3e (patch) | |
| tree | e828f74bd75a55a3fc1034c509d5afd813d6f573 | |
| parent | 9ffc22923ee7b705a30b7b6ad4704cdc8828a16a (diff) | |
| download | mpv-5e6c4de69e157301204a543b108b40d513983e3e.tar.bz2 mpv-5e6c4de69e157301204a543b108b40d513983e3e.tar.xz | |
demux_avi: Add WAVEFORMATEXTENSIBLE support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32639 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libmpdemux/aviheader.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demux_audio.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c index ac3a7f7ae6..1d52428c42 100644 --- a/libmpdemux/aviheader.c +++ b/libmpdemux/aviheader.c @@ -331,6 +331,8 @@ while(1){ sh_audio->wf=realloc(sh_audio->wf, sizeof(*sh_audio->wf)+sh_audio->wf->cbSize); } sh_audio->format=sh_audio->wf->wFormatTag; + if (sh_audio->wf->wFormatTag == 0xfffe && sh_audio->wf->cbSize >= 22) + sh_audio->format = le2me_16(((WAVEFORMATEXTENSIBLE *)sh_audio->wf)->SubFormat); if (sh_audio->format == 1 && last_fccHandler == mmioFOURCC('A', 'x', 'a', 'n')) sh_audio->format = last_fccHandler; diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c index 6d8b891cd7..327c6ddfce 100644 --- a/libmpdemux/demux_audio.c +++ b/libmpdemux/demux_audio.c @@ -415,7 +415,7 @@ static int demux_audio_open(demuxer_t* demuxer) { stream_read(s,(char*)(w + 1),w->cbSize); l -= w->cbSize; if (w->wFormatTag == 0xfffe && w->cbSize >= 22) - sh_audio->format = av_le2ne16(((WAVEFORMATEXTENSIBLE *)w)->SubFormat); + sh_audio->format = le2me_16(((WAVEFORMATEXTENSIBLE *)w)->SubFormat); } if( mp_msg_test(MSGT_DEMUX,MSGL_V) ) print_wave_header(w, MSGL_V); |