# HG changeset patch
# User reimar
# Date 1290342344 0
# Node ID 2e4da7887fd1258347ca4052968b8996cdfba7d8
# Parent  72ee0026e4415439be12aad6f46f7e43595783c4
Add WAVEFORMATEXTENSIBLE support to AVI demuxer.

diff -r 72ee0026e441 -r 2e4da7887fd1 libmpdemux/aviheader.c
--- a/libmpdemux/aviheader.c	Sun Nov 21 12:25:01 2010 +0000
+++ b/libmpdemux/aviheader.c	Sun Nov 21 12:25:44 2010 +0000
@@ -332,6 +332,8 @@
 	    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;