diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:25:15 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:25:15 +0200 |
| commit | acdce0176ae3722ad38a23aae0cf0bf03a82f9c4 (patch) | |
| tree | 57a30f1d44ea193586d5723faac7ffb96a3a73aa /libmpdemux/demux_audio.c | |
| parent | ef3ef5e218588b5f68b427729a3c2c1a8083e499 (diff) | |
| parent | 5a2289137f43501281dba83fe98b5f67be63f9ef (diff) | |
| download | mpv-acdce0176ae3722ad38a23aae0cf0bf03a82f9c4.tar.bz2 mpv-acdce0176ae3722ad38a23aae0cf0bf03a82f9c4.tar.xz | |
Merge svn changes up to r30732
Diffstat (limited to 'libmpdemux/demux_audio.c')
| -rw-r--r-- | libmpdemux/demux_audio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c index 6c62e5fdc5..45ead3d325 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); |