diff options
| author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-11-12 22:58:46 +0000 |
|---|---|---|
| committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-11-12 22:58:46 +0000 |
| commit | ebd2e9bcc3529a53d21255203786fa9eca012228 (patch) | |
| tree | dfe58a6c4a014d749c06aa6818ffa599a21b35a8 | |
| parent | 851cba18e77b60bd2195dea1228a70176a1b81c2 (diff) | |
| download | usdx-ebd2e9bcc3529a53d21255203786fa9eca012228.tar.gz usdx-ebd2e9bcc3529a53d21255203786fa9eca012228.tar.xz usdx-ebd2e9bcc3529a53d21255203786fa9eca012228.zip | |
initialize module-handle before call to LoadModule
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2736 b956fd51-792f-4845-bead-9b4dfca2ff2c
| -rw-r--r-- | mediaplugin/src/media/UMediaPlugin.pas | 1 | ||||
| -rw-r--r-- | mediaplugin/src/plugins/media/ffmpeg/Makefile.am | 2 | ||||
| -rw-r--r-- | mediaplugin/src/plugins/media/ffmpeg/Makefile.in | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/mediaplugin/src/media/UMediaPlugin.pas b/mediaplugin/src/media/UMediaPlugin.pas index eb4cf395..4baa778a 100644 --- a/mediaplugin/src/media/UMediaPlugin.pas +++ b/mediaplugin/src/media/UMediaPlugin.pas @@ -440,6 +440,7 @@ begin begin FileInfo := Iter.Next(); ModuleFile := MediaPluginPath.Append(FileInfo.Name); + Module := INVALID_MODULEHANDLE_VALUE; if (not LoadModule(Module, PChar(ModuleFile.ToNative))) then begin Log.LogInfo('Failed to load media plugin: "' + FileInfo.Name.ToNative + '"', diff --git a/mediaplugin/src/plugins/media/ffmpeg/Makefile.am b/mediaplugin/src/plugins/media/ffmpeg/Makefile.am index 12533bc8..7f38d2f6 100644 --- a/mediaplugin/src/plugins/media/ffmpeg/Makefile.am +++ b/mediaplugin/src/plugins/media/ffmpeg/Makefile.am @@ -9,4 +9,4 @@ libffmpegplugin_la_LDFLAGS = -shared -dynamic -avoid-version \ $(LDFLAGS) compile: libffmpegplugin.la - cp .libs/*$(LIB_EXT) $(PLUGIN_DIR) + cp .libs/libffmpegplugin$(LIB_EXT) $(PLUGIN_DIR) diff --git a/mediaplugin/src/plugins/media/ffmpeg/Makefile.in b/mediaplugin/src/plugins/media/ffmpeg/Makefile.in index c465dbd0..56613133 100644 --- a/mediaplugin/src/plugins/media/ffmpeg/Makefile.in +++ b/mediaplugin/src/plugins/media/ffmpeg/Makefile.in @@ -756,7 +756,7 @@ uninstall-am: uninstall-libLTLIBRARIES compile: libffmpegplugin.la - cp .libs/*$(LIB_EXT) $(PLUGIN_DIR) + cp .libs/libffmpegplugin$(LIB_EXT) $(PLUGIN_DIR) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. |