[Opalvoip-svn] SF.net SVN: opalvoip:[33292] opal/branches/v3_14/plugins/video

[<rjo...@us...>]

Revision: 33292
          http://sourceforge.net/p/opalvoip/code/33292
Author:   rjongbloed
Date:     2015-01-27 00:40:02 +0000 (Tue, 27 Jan 2015)
Log Message:
-----------
Update VS2010 build files for FFMPEG plug ins

Modified Paths:
--------------
    opal/branches/v3_14/plugins/video/H.263-1998/h263_2010.vcxproj
    opal/branches/v3_14/plugins/video/H.263-1998/h263_2010.vcxproj.filters
    opal/branches/v3_14/plugins/video/x264/h264-x264_2010.vcxproj
    opal/branches/v3_14/plugins/video/x264/h264-x264_2010.vcxproj.filters

Property Changed:
----------------
    opal/branches/v3_14/plugins/video/common/
    opal/branches/v3_14/plugins/video/x264/

Modified: opal/branches/v3_14/plugins/video/H.263-1998/h263_2010.vcxproj
===================================================================
--- opal/branches/v3_14/plugins/video/H.263-1998/h263_2010.vcxproj	2015-01-27 00:39:30 UTC (rev 33291)
+++ opal/branches/v3_14/plugins/video/H.263-1998/h263_2010.vcxproj	2015-01-27 00:40:02 UTC (rev 33292)
@@ -50,6 +50,10 @@
     </LinkIncremental>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">h263_ffmpeg_ptplugin</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">h263_ffmpeg_ptplugin</TargetName>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\common\ffmpeg-win32-dev\include;..\..\..\..\external\ffmpeg-win32-dev\include;..\common;..\..\..\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\common\ffmpeg-win32-dev\lib;..\..\..\..\external\ffmpeg-win32-dev\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</LibraryPath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\common\ffmpeg-win32-dev\include;..\..\..\..\external\ffmpeg-win32-dev\include;..\common;..\..\..\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\common\ffmpeg-win32-dev\lib;..\..\..\..\external\ffmpeg-win32-dev\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>
@@ -136,13 +140,16 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\common\encframe.cxx" />
     <ClCompile Include="..\common\ffmpeg.cxx" />
     <ClCompile Include="h263-1998.cxx" />
     <ClCompile Include="rfc2429.cxx" />
     <ClCompile Include="rfc2190.cxx" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\common\encframe.h" />
     <ClInclude Include="..\common\ffmpeg.h" />
+    <ClInclude Include="..\common\platform.h" />
     <ClInclude Include="h263-1998.h" />
     <ClInclude Include="rfc2429.h" />
     <ClInclude Include="rfc2190.h" />

Modified: opal/branches/v3_14/plugins/video/H.263-1998/h263_2010.vcxproj.filters
===================================================================
--- opal/branches/v3_14/plugins/video/H.263-1998/h263_2010.vcxproj.filters	2015-01-27 00:39:30 UTC (rev 33291)
+++ opal/branches/v3_14/plugins/video/H.263-1998/h263_2010.vcxproj.filters	2015-01-27 00:40:02 UTC (rev 33292)
@@ -22,6 +22,9 @@
     <ClCompile Include="..\common\ffmpeg.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\common\encframe.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="h263-1998.h">
@@ -36,5 +39,11 @@
     <ClInclude Include="..\common\ffmpeg.h">
       <Filter>Include Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\encframe.h">
+      <Filter>Include Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\platform.h">
+      <Filter>Include Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

Index: opal/branches/v3_14/plugins/video/common
===================================================================
--- opal/branches/v3_14/plugins/video/common	2015-01-27 00:39:30 UTC (rev 33291)
+++ opal/branches/v3_14/plugins/video/common	2015-01-27 00:40:02 UTC (rev 33292)

Property changes on: opal/branches/v3_14/plugins/video/common
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+ffmpeg-win32-dev
Index: opal/branches/v3_14/plugins/video/x264
===================================================================
--- opal/branches/v3_14/plugins/video/x264	2015-01-27 00:39:30 UTC (rev 33291)
+++ opal/branches/v3_14/plugins/video/x264	2015-01-27 00:40:02 UTC (rev 33292)

Property changes on: opal/branches/v3_14/plugins/video/x264
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+x264
+*.user
Modified: opal/branches/v3_14/plugins/video/x264/h264-x264_2010.vcxproj
===================================================================
--- opal/branches/v3_14/plugins/video/x264/h264-x264_2010.vcxproj	2015-01-27 00:39:30 UTC (rev 33291)
+++ opal/branches/v3_14/plugins/video/x264/h264-x264_2010.vcxproj	2015-01-27 00:40:02 UTC (rev 33292)
@@ -75,14 +75,14 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug (licensed)|Win32'">h264_x264_ptplugin</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">h264_x264_ptplugin</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release (licensed)|Win32'">h264_x264_ptplugin</TargetName>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug (licensed)|Win32'">.\x264;..\..\..\..\external\x264;..\common;..\common\ffmpeg;..\..\..\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\x264;..\..\..\..\external\x264;..\common;..\common\ffmpeg;..\..\..\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release (licensed)|Win32'">.\x264;..\..\..\..\external\x264;..\common;..\common\ffmpeg;..\..\..\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\x264;..\..\..\..\external\x264;..\common;..\common\ffmpeg;..\..\..\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug (licensed)|Win32'">.\x264;..\..\..\..\external\x264;..\common\ffmpeg\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</LibraryPath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\x264;..\..\..\..\external\x264;..\common\ffmpeg\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</LibraryPath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release (licensed)|Win32'">.\x264;..\..\..\..\external\x264;..\common\ffmpeg\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</LibraryPath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\x264;..\..\..\..\external\x264;..\common\ffmpeg\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</LibraryPath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug (licensed)|Win32'">.\x264;..\..\..\..\external\x264;..\common\ffmpeg-win32-dev\include;..\..\..\..\external\ffmpeg-win32-dev\include;..\common;..\..\..\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\x264;..\..\..\..\external\x264;..\common\ffmpeg-win32-dev\include;..\..\..\..\external\ffmpeg-win32-dev\include;..\common;..\..\..\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release (licensed)|Win32'">.\x264;..\..\..\..\external\x264;..\common\ffmpeg-win32-dev\include;..\..\..\..\external\ffmpeg-win32-dev\include;..\common;..\..\..\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\x264;..\..\..\..\external\x264;..\common\ffmpeg-win32-dev\include;..\..\..\..\external\ffmpeg-win32-dev\include;..\common;..\..\..\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug (licensed)|Win32'">.\x264;..\..\..\..\external\x264;..\common\ffmpeg-win32-dev\lib;..\..\..\..\external\ffmpeg-win32-dev\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</LibraryPath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\x264;..\..\..\..\external\x264;..\common\ffmpeg-win32-dev\lib;..\..\..\..\external\ffmpeg-win32-dev\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</LibraryPath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release (licensed)|Win32'">.\x264;..\..\..\..\external\x264;..\common\ffmpeg-win32-dev\lib;..\..\..\..\external\ffmpeg-win32-dev\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</LibraryPath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\x264;..\..\..\..\external\x264;..\common\ffmpeg-win32-dev\lib;..\..\..\..\external\ffmpeg-win32-dev\lib;$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -233,15 +233,19 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\common\encframe.cxx" />
     <ClCompile Include="..\common\ffmpeg.cxx" />
+    <ClCompile Include="..\common\h264frame.cxx" />
     <ClCompile Include="h264-x264.cxx" />
-    <ClCompile Include="shared\x264wrap.cxx" />
-    <ClCompile Include="shared\h264frame.cxx" />
+    <ClCompile Include="x264wrap.cxx" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\common\encframe.h" />
     <ClInclude Include="..\common\ffmpeg.h" />
+    <ClInclude Include="..\common\h264frame.h" />
+    <ClInclude Include="..\common\platform.h" />
     <ClInclude Include="h264-x264.h" />
-    <ClInclude Include="shared\x264wrap.h" />
+    <ClInclude Include="x264wrap.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Modified: opal/branches/v3_14/plugins/video/x264/h264-x264_2010.vcxproj.filters
===================================================================
--- opal/branches/v3_14/plugins/video/x264/h264-x264_2010.vcxproj.filters	2015-01-27 00:39:30 UTC (rev 33291)
+++ opal/branches/v3_14/plugins/video/x264/h264-x264_2010.vcxproj.filters	2015-01-27 00:40:02 UTC (rev 33292)
@@ -12,25 +12,37 @@
     <ClCompile Include="h264-x264.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="shared\x264wrap.cxx">
+    <ClCompile Include="..\common\ffmpeg.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="shared\h264frame.cxx">
+    <ClCompile Include="..\common\encframe.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\ffmpeg.cxx">
+    <ClCompile Include="..\common\h264frame.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="x264wrap.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="h264-x264.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="shared\x264wrap.h">
+    <ClInclude Include="..\common\ffmpeg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\ffmpeg.h">
+    <ClInclude Include="..\common\encframe.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\platform.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\h264frame.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="x264wrap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.