[vlc-devel] commit: Fixed compilation (dmo). (Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Wed May 13 21:31:04 2009 +0200| [96000eee2e0d0bb164160e29e7b897e6ec1dfede] | committer: Laurent Aimar 

Fixed compilation (dmo).

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=96000eee2e0d0bb164160e29e7b897e6ec1dfede
---

 modules/codec/dmo/dmo.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/codec/dmo/dmo.c b/modules/codec/dmo/dmo.c
index 6f94d52..159d5f1 100644
--- a/modules/codec/dmo/dmo.c
+++ b/modules/codec/dmo/dmo.c
@@ -200,7 +200,6 @@ static const codec_dll decoders_table[] =
     { VLC_CODEC_WMVA,   "wmvadvd.dll", &guid_wmva },
 
     /* WMA 3 */
-    { VLC_CODEC_WMA3,   "wma9dmod.dll", &guid_wma9 },
     { VLC_CODEC_WMAP,   "wma9dmod.dll", &guid_wma9 },
     /* WMA 2 */
     { VLC_CODEC_WMA2,   "wma9dmod.dll", &guid_wma9 },
@@ -222,7 +221,7 @@ static const codec_dll encoders_table[] =
     { VLC_CODEC_WMV1, "wmvdmoe2.dll", &guid_wmv_enc2 },
 
     /* WMA 3 */
-    { VLC_CODEC_WMA3, "wmadmoe.dll", &guid_wma_enc },
+    { VLC_CODEC_WMAP, "wmadmoe.dll", &guid_wma_enc },
     /* WMA 2 */
     { VLC_CODEC_WMA2, "wmadmoe.dll", &guid_wma_enc },
 
@@ -431,7 +430,7 @@ static int DecOpen( decoder_t *p_dec )
 
         dmo_input_type.majortype  = MEDIATYPE_Video;
         dmo_input_type.subtype    = dmo_input_type.majortype;
-        dmo_input_type.subtype.Data1 = p_dec->fmt_in.i_original_fourcc ?: p_dec->fmt_in.i_codec
+        dmo_input_type.subtype.Data1 = p_dec->fmt_in.i_original_fourcc ?: p_dec->fmt_in.i_codec;
         dmo_input_type.formattype = FORMAT_VideoInfo;
         dmo_input_type.bFixedSizeSamples = 0;
         dmo_input_type.bTemporalCompression = 1;