vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Mon Nov 10 14:43:15 2014 +0100| [f4bf662c541492e8c329d389c4b37fd2503149d7] | committer: Hugo Beauzée-Luyssen
dmo: Be unicode agnostic > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f4bf662c541492e8c329d389c4b37fd2503149d7 --- modules/codec/dmo/dmo.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/codec/dmo/dmo.c b/modules/codec/dmo/dmo.c index 999df8b..351ff19 100644 --- a/modules/codec/dmo/dmo.c +++ b/modules/codec/dmo/dmo.c @@ -162,7 +162,7 @@ static const GUID guid_wmv9_enc = { 0xd23b90d0, 0x144f, 0x46bd,{ 0x84, 0x1d, 0x5 typedef struct { vlc_fourcc_t i_fourcc; - const char *psz_dll; + const TCHAR *psz_dll; const GUID *p_guid; } codec_dll; @@ -170,30 +170,30 @@ typedef struct static const codec_dll decoders_table[] = { /* WVC1 */ - { VLC_CODEC_VC1, "wvc1dmod.dll", &guid_wvc1 }, + { VLC_CODEC_VC1, TEXT("wvc1dmod.dll"), &guid_wvc1 }, /* WMV3 */ - { VLC_CODEC_WMV3, "wmv9dmod.dll", &guid_wmv9 }, + { VLC_CODEC_WMV3, TEXT("wmv9dmod.dll"), &guid_wmv9 }, /* WMV2 */ - { VLC_CODEC_WMV2, "wmvdmod.dll", &guid_wmv }, + { VLC_CODEC_WMV2, TEXT("wmvdmod.dll"), &guid_wmv }, /* WMV1 */ - { VLC_CODEC_WMV1, "wmvdmod.dll", &guid_wmv }, + { VLC_CODEC_WMV1, TEXT("wmvdmod.dll"), &guid_wmv }, /* Screen codecs */ - { VLC_CODEC_MSS2, "WMVSDECD.DLL", &guid_wms }, - { VLC_CODEC_MSS2, "wmsdmod.dll", &guid_wms }, - { VLC_CODEC_MSS1, "WMVSDECD.DLL", &guid_wms }, - { VLC_CODEC_MSS1, "wmsdmod.dll", &guid_wms }, + { VLC_CODEC_MSS2, TEXT("WMVSDECD.DLL"), &guid_wms }, + { VLC_CODEC_MSS2, TEXT("wmsdmod.dll"), &guid_wms }, + { VLC_CODEC_MSS1, TEXT("WMVSDECD.DLL"), &guid_wms }, + { VLC_CODEC_MSS1, TEXT("wmsdmod.dll"), &guid_wms }, /* Windows Media Video Adv */ - { VLC_CODEC_WMVA, "wmvadvd.dll", &guid_wmva }, + { VLC_CODEC_WMVA, TEXT("wmvadvd.dll"), &guid_wmva }, /* WMA 3 */ - { VLC_CODEC_WMAP, "wma9dmod.dll", &guid_wma9 }, - { VLC_CODEC_WMAL, "wma9dmod.dll", &guid_wma9 }, + { VLC_CODEC_WMAP, TEXT("wma9dmod.dll"), &guid_wma9 }, + { VLC_CODEC_WMAL, TEXT("wma9dmod.dll"), &guid_wma9 }, /* WMA 2 */ - { VLC_CODEC_WMA2, "wma9dmod.dll", &guid_wma9 }, + { VLC_CODEC_WMA2, TEXT("wma9dmod.dll"), &guid_wma9 }, /* WMA Speech */ - { VLC_CODEC_WMAS, "wmspdmod.dll", &guid_wma }, + { VLC_CODEC_WMAS, TEXT("wmspdmod.dll"), &guid_wma }, /* */ { 0, NULL, NULL } @@ -689,7 +689,7 @@ static int LoadDMO( vlc_object_t *p_this, HINSTANCE *p_hmsdmo_dll, } /* Load msdmo DLL */ - *p_hmsdmo_dll = LoadLibraryA( "msdmo.dll" ); + *p_hmsdmo_dll = LoadLibrary( TEXT( "msdmo.dll" ) ); if( *p_hmsdmo_dll == NULL ) { msg_Dbg( p_this, "failed loading msdmo.dll" ); @@ -767,7 +767,7 @@ loader: if( codecs_table[i_codec].i_fourcc == 0 ) return VLC_EGENERIC; /* Can't happen */ - *p_hmsdmo_dll = LoadLibraryA( codecs_table[i_codec].psz_dll ); + *p_hmsdmo_dll = LoadLibrary( codecs_table[i_codec].psz_dll ); if( *p_hmsdmo_dll == NULL ) { msg_Dbg( p_this, "failed loading '%s'", _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
