[vlc-commits] DMO: use VLC_CODEC_*

Jean-Baptiste Kempf git at videolan.org
Thu Sep 13 18:02:31 CEST 2012


vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jun 24 23:47:02 2012 +0200| [adf11a53000ca3e47df9f20129a334ba18c8f1a4] | committer: Jean-Baptiste Kempf

DMO: use VLC_CODEC_*
(cherry picked from commit df878fa04342c1b0ae5a47f4171d233460de0770)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/codec/dmo/dmo.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/codec/dmo/dmo.c b/modules/codec/dmo/dmo.c
index c94e8d5..32bc11d 100644
--- a/modules/codec/dmo/dmo.c
+++ b/modules/codec/dmo/dmo.c
@@ -176,6 +176,9 @@ static const GUID guid_wmv_enc = { 0x3181343b, 0x94a2, 0x4feb, { 0xad, 0xef, 0x3
 static const GUID guid_wmv_enc2 = { 0x96b57cdd, 0x8966, 0x410c,{ 0xbb, 0x1f, 0xc9, 0x7e, 0xea, 0x76, 0x5c, 0x04 } };
 static const GUID guid_wma_enc = { 0x70f598e9, 0xf4ab, 0x495a, { 0x99, 0xe2, 0xa7, 0xc4, 0xd3, 0xd8, 0x9a, 0xbf } };
 
+#define VLC_CODEC_MSS1      VLC_FOURCC('M','S','S','1')
+#define VLC_CODEC_MSS2      VLC_FOURCC('M','S','S','2')
+
 typedef struct
 {
     vlc_fourcc_t i_fourcc;
@@ -195,10 +198,8 @@ static const codec_dll decoders_table[] =
     /* WMV1 */
     { VLC_CODEC_WMV1,   "wmvdmod.dll", &guid_wmv },
     /* Screen codecs */
-    { VLC_FOURCC('M','S','S','2'), "wmsdmod.dll", &guid_wms },
-    { VLC_FOURCC('m','s','s','2'), "wmsdmod.dll", &guid_wms },
-    { VLC_FOURCC('M','S','S','1'), "wmsdmod.dll", &guid_wms },
-    { VLC_FOURCC('m','s','s','1'), "wmsdmod.dll", &guid_wms },
+    { VLC_CODEC_MSS2,   "wmsdmod.dll", &guid_wms },
+    { VLC_CODEC_MSS1,   "wmsdmod.dll", &guid_wms },
     /* Windows Media Video Adv */
     { VLC_CODEC_WMVA,   "wmvadvd.dll", &guid_wmva },
 



More information about the vlc-commits mailing list