summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_audio.c
diff options
context:
space:
mode:
authortack <tack@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-22 14:27:32 +0000
committertack <tack@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-22 14:27:32 +0000
commitcc8a878a9cb9688b2eb53b7ee3c6d82bc1555aaf (patch)
tree49773c4cc09efc6e2009505717711c13af11243d /libmpdemux/demux_audio.c
parent2f19fe91ec33bd4b480609dd7040e6255e986df9 (diff)
downloadmpv-cc8a878a9cb9688b2eb53b7ee3c6d82bc1555aaf.tar.bz2
mpv-cc8a878a9cb9688b2eb53b7ee3c6d82bc1555aaf.tar.xz
Get the proper codec id when a WAVE_FORMAT_EXTENSIBLE extension exists in a
wave file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30709 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_audio.c')
-rw-r--r--libmpdemux/demux_audio.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c
index 63b710427d..9c1c006003 100644
--- a/libmpdemux/demux_audio.c
+++ b/libmpdemux/demux_audio.c
@@ -416,6 +416,8 @@ static int demux_audio_open(demuxer_t* demuxer) {
}
stream_read(s,(char*)((char*)(w)+sizeof(WAVEFORMATEX)),w->cbSize);
l -= w->cbSize;
+ if (w->wFormatTag & 0xfffe && w->cbSize >= 22)
+ sh_audio->format = ((WAVEFORMATEXTENSIBLE *)w)->SubFormat;
}
if( mp_msg_test(MSGT_DEMUX,MSGL_V) ) print_wave_header(w, MSGL_V);