Changeset 1356

Timestamp:

01/26/08 15:14:19 (10 months ago)

Author:

glslang

Message:

+ build fixes
+ some workarounds for crash avoidance

Location:

trunk

Files:

• installer/openlibraries_runtime.nsi (modified) (2 diffs)
• installer/openlibraries_sdk.nsi (modified) (1 diff)
• src/openmedialib/plugins/gensys/gensys_plugin.cpp (modified) (1 diff)
• src/openmedialib/plugins/quicktime/quicktime_plugin.opl (modified) (1 diff)

trunk/installer/openlibraries_runtime.nsi

@@ -154 +154 @@
   ; dependencies
   File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
-  File "C:\Program Files\FFmpeg\lib\avformat-51.dll"
+  File "C:\Program Files\FFmpeg\lib\avformat-52.dll"
   File "C:\Program Files\FFmpeg\lib\avutil-49.dll"
+  File "C:\Program Files\FFmpeg\lib\libmp3lame-0.dll"
 ;  File "C:\Program Files\FFmpeg\lib\libogg-0.dll"
   File "C:\OpenEXR\bin\Release\Half.dll"
@@ -203 +204 @@
   File "..\src\openmedialib\plugins\openal\openal_plugin.opl"
   File "..\src\openmedialib\plugins\openal\Multi-threaded Release DLL\openmedialib_openal-vc80-r-${VERSION}.dll"
-;  File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
-;  File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll"
+  File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
+  File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll"
   File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
   File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-${VERSION}.dll"

trunk/installer/openlibraries_sdk.nsi

@@ -224 +224 @@
   ; dependencies
   File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
-  File "C:\Program Files\FFmpeg\lib\avformat-51.dll"
+  File "C:\Program Files\FFmpeg\lib\avformat-52.dll"
   File "C:\Program Files\FFmpeg\lib\avutil-49.dll"
+  File "C:\Program Files\FFmpeg\lib\libmp3lame-0.dll"
 ;  File "C:\Program Files\FFmpeg\lib\libogg-0.dll"
   File "C:\OpenEXR\bin\Debug\Half.dll"

trunk/src/openmedialib/plugins/gensys/gensys_plugin.cpp

@@ -1458 +1458 @@
                                         }
 
-                                        result = frame_type::deep_copy( map_.find( requested )->second );
-                                        if ( result && reseat_->has( samples ) )
-                                                result->set_audio( reseat_->retrieve( samples ) );
-
-                                        std::map< int, frame_type_ptr >::iterator iter = map_.begin( );
+                                        result = frame_type_ptr( );
+                                        std::map< int, frame_type_ptr >::iterator iter = map_.find( requested );
+                                        if( iter != map_.end( ) )
+                                        {
+                                                result = frame_type::deep_copy( iter->second );
+                                                if ( result && reseat_->has( samples ) )
+                                                        result->set_audio( reseat_->retrieve( samples ) );
+                                        }
+                                        
+                                        iter = map_.begin( );
                                         while( iter != map_.end( ) )
                                         {

trunk/src/openmedialib/plugins/quicktime/quicktime_plugin.opl

@@ -3 +3 @@
         <!-- plugins go here -->
         <openmedialib name="oml" version="0.1.0">
-                <plugin name="OpenLibraries quicktime plugin" type="input" in_filter="*.mov" extension='".*\.mov"' merit="10" filename='"libopenmedialib_quicktime.so", "libopenmedialib_quicktime.dylib", "openmedialib_quicktime-vc80-d-0_5_0.dll", "openmedialib_quicktime-vc80-r-0_5_0.dll"'/>
+                <plugin name="OpenLibraries quicktime plugin" type="input" in_filter="*.mov" extension='".*\.mov"' merit="1" filename='"libopenmedialib_quicktime.so", "libopenmedialib_quicktime.dylib", "openmedialib_quicktime-vc80-d-0_5_0.dll", "openmedialib_quicktime-vc80-r-0_5_0.dll"'/>
                 <plugin name="OpenLibraries quicktime plugin" type="output" extension='".*\.mov"' merit="80" filename='"libopenmedialib_quicktime.so", "libopenmedialib_quciktime.dylib", "openmedialib_quicktime-vc80-d-0_5_0.dll", "openmedialib_quicktime-vc80-r-0_5_0.dll"'/>
 </openmedialib>