From: Laurent Aimar <fenrir@videolan.org>
Date: Fri, 15 May 2009 23:09:40 +0000 (+0200)
Subject: Merge commit 'origin/1.0-bugfix'
X-Git-Tag: 1.1.0-ff~5940
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=89b6530d8abd99b96b9f33af022022241fe97ee2;p=vlc

Merge commit 'origin/1.0-bugfix'

Conflicts:

	modules/codec/dmo/dmo.c
---

89b6530d8abd99b96b9f33af022022241fe97ee2
diff --cc modules/codec/dmo/dmo.c
index fff44f6f40,684d80ea9e..3875791fee
--- a/modules/codec/dmo/dmo.c
+++ b/modules/codec/dmo/dmo.c
@@@ -197,16 -205,25 +199,17 @@@ static const codec_dll decoders_table[
      { VLC_FOURCC('M','S','S','1'), "wmsdmod.dll", &guid_wms },
      { VLC_FOURCC('m','s','s','1'), "wmsdmod.dll", &guid_wms },
      /* Windows Media Video Adv */
 -    { VLC_FOURCC('W','M','V','A'), "wmvadvd.dll", &guid_wmva },
 -    { VLC_FOURCC('w','m','v','a'), "wmvadvd.dll", &guid_wmva },
 -    { VLC_FOURCC('W','V','P','2'), "wmvadvd.dll", &guid_wmva },
 -    { VLC_FOURCC('w','v','p','2'), "wmvadvd.dll", &guid_wmva },
 +    { VLC_CODEC_WMVA,   "wmvadvd.dll", &guid_wmva },
  
      /* WMA 3 */
 -    { VLC_FOURCC('W','M','A','3'), "wma9dmod.dll", &guid_wma9 },
 -    { VLC_FOURCC('w','m','a','3'), "wma9dmod.dll", &guid_wma9 },
 -    { VLC_FOURCC('W','M','A','P'), "wma9dmod.dll", &guid_wma9 },
 -    { VLC_FOURCC('w','m','a','p'), "wma9dmod.dll", &guid_wma9 },
 -    { VLC_FOURCC('W','M','A','L'), "wma9dmod.dll", &guid_wma9 },
 -    { VLC_FOURCC('w','m','a','l'), "wma9dmod.dll", &guid_wma9 },
 +    { VLC_CODEC_WMAP,   "wma9dmod.dll", &guid_wma9 },
 +    { VLC_CODEC_WMAL,   "wma9dmod.dll", &guid_wma9 },
++
      /* WMA 2 */
 -    { VLC_FOURCC('W','M','A','2'), "wma9dmod.dll", &guid_wma9 },
 -    { VLC_FOURCC('w','m','a','2'), "wma9dmod.dll", &guid_wma9 },
 +    { VLC_CODEC_WMA2,   "wma9dmod.dll", &guid_wma9 },
  
      /* WMA Speech */
 -    { VLC_FOURCC('W','M','A','S'), "wmspdmod.dll", &guid_wma },
 -    { VLC_FOURCC('w','m','a','s'), "wmspdmod.dll", &guid_wma },
 +    { VLC_CODEC_WMAS,   "wmspdmod.dll", &guid_wma },
  
      /* */
      { 0, NULL, NULL }