Merge branch 'gstreamer' into develop

Conflicts:
	Output/x64/gstreamer/GstreamerHelper.dll
This commit is contained in:
Alexander Eckart committed 2013-02-23 11:33:31 +01:00
commit fe600f5a70
1 file changed
+1
+1
View File
@@ -141,6 +141,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>gstreamer-1.0.lib;gstcontroller-1.0.lib;gobject-2.0.lib;glib-2.0.lib;gstapp-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWin|x64'">