[MPlayer-cvslog] r32639 - trunk/libmpdemux/aviheader.c

[reimar]

Author: reimar
Date: Sun Nov 21 13:25:44 2010
New Revision: 32639

Log:
Add WAVEFORMATEXTENSIBLE support to AVI demuxer.

Modified:
   trunk/libmpdemux/aviheader.c

Modified: trunk/libmpdemux/aviheader.c
==============================================================================
--- trunk/libmpdemux/aviheader.c	Sun Nov 21 13:25:01 2010	(r32638)
+++ trunk/libmpdemux/aviheader.c	Sun Nov 21 13:25:44 2010	(r32639)
@@ -332,6 +332,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 = av_le2ne16(((WAVEFORMATEXTENSIBLE *)sh_audio->wf)->SubFormat);
 	if (sh_audio->format == 1 &&
 	    last_fccHandler == mmioFOURCC('A', 'x', 'a', 'n'))
 	    sh_audio->format = last_fccHandler;