generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't load welsdec.dll at runtime in the decConsole test app on windows

Browse Source 
Instead just link directly to it. This matches how the library is
linked/loaded in encConsole/h264enc as well.

Only the 2008 version project file is updated for now, since
the 2010 and 2012 ones are out of sync right now.
This commit is contained in:
Martin Storsjö 2014-01-17 11:49:24 +02:00
parent 7f6cdb516d
commit 6e75136201
2 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codec/build/win32/dec/decConsole.vcproj
View File

@ -74,6 +74,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="$(OutDir)\welsdec.lib"
OutputFile="$(OutDir)\decConsole.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -166,6 +167,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="$(OutDir)\welsdec.lib"
OutputFile="$(OutDir)\decConsole.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -258,6 +260,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="$(OutDir)\welsdec.lib"
OutputFile="$(OutDir)\decConsoled.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@ -351,6 +354,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="$(OutDir)\welsdec.lib"
OutputFile="$(OutDir)\decConsoled.exe"
LinkIncremental="2"
SuppressStartupBanner="true"

34
codec/console/dec/src/h264dec.cpp
View File

@ -433,41 +433,11 @@ int32_t main (int32_t iArgC, char* pArgV[]) {
#if defined(_MSC_VER)
HMODULE hModule = LoadLibraryA (".\\welsdec.dll");
PCreateDecoderFunc pCreateDecoderFunc = NULL;
PDestroyDecoderFunc pDestroyDecoderFunc = NULL;
pCreateDecoderFunc = (PCreateDecoderFunc)::GetProcAddress (hModule, "CreateDecoder");
pDestroyDecoderFunc = (PDestroyDecoderFunc)::GetProcAddress (hModule, "DestroyDecoder");
if ((hModule != NULL) && (pCreateDecoderFunc != NULL) && (pDestroyDecoderFunc != NULL)) {
printf ("load library sw function successfully\n");
if (pCreateDecoderFunc (&pDecoder) || (NULL == pDecoder)) {
printf ("Create Decoder failed.\n");
return 1;
}
} else {
printf ("load library sw function failed\n");
return 1;
}
#else
if (CreateDecoder (&pDecoder) || (NULL == pDecoder)) {
printf ("Create Decoder failed.\n");
return 1;
}
#endif
if (pDecoder->Initialize (&sDecParam, INIT_TYPE_PARAMETER_BASED)) {
printf ("Decoder initialization failed.\n");
return 1;
@ -489,11 +459,7 @@ int32_t main (int32_t iArgC, char* pArgV[]) {
if (pDecoder) {
pDecoder->Uninitialize();
#if defined(_MSC_VER)
pDestroyDecoderFunc (pDecoder);
#else
DestroyDecoder (pDecoder);
#endif
}
return 0;