Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
f4bf662c
Commit
f4bf662c
authored
Nov 10, 2014
by
Hugo Beauzée-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dmo: Be unicode agnostic
parent
31d8cc64
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
16 deletions
+16
-16
modules/codec/dmo/dmo.c
modules/codec/dmo/dmo.c
+16
-16
No files found.
modules/codec/dmo/dmo.c
View file @
f4bf662c
...
...
@@ -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
=
LoadLibrary
A
(
"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
=
LoadLibrary
A
(
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'"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment