Changeset 572 for trunk/Utilities/FFmpeg/FFmpegApp

Timestamp:

Jan 20, 2016, 2:48:16 AM (7 years ago)

Author:

roman

Message:

Upgraded to VS 2013 and checked with current Zeranoe FFmpeg

Location:

trunk/Utilities/FFmpeg/FFmpegApp

Files:

• . (modified) (1 prop)
• FFmpegApp.cpp (modified) (2 diffs)
• FFmpegApp.sln (modified) (1 diff)
• FFmpegApp.vcxproj (modified) (6 diffs)

trunk/Utilities/FFmpeg/FFmpegApp

@@ -2 +2 @@
 *.user
 *.suo
+Debug

@@ -2 +2 @@
 *.user
 *.suo
+Debug

trunk/Utilities/FFmpeg/FFmpegApp/FFmpegApp.cpp

@@ -1 +1 @@
 ////////////////////////////////////////////////////////////
-// Copyright (C) Roman Ryltsov, 2008-2012
+// Copyright (C) Roman Ryltsov, 2008-2016
 // Created by Roman Ryltsov roman@alax.info
-// 
-// $Id$
 
 #include "stdafx.h"
@@ -9 +7 @@
 extern "C" 
 {
-        #include "dev\include\libavcodec\avcodec.h"
+        // NOTE: Additional directory ..\zeranoe.com\dev\include gets to the files
+        #include "libavcodec\avcodec.h"
 }
 
-#pragma comment(lib, "dev\\lib\\avcodec.lib")
+// NOTE: Additional directory ..\zeranoe.com\dev\lib gets to the files
+#pragma comment(lib, "avcodec.lib")
 
+// NOTE: Be sure to copy DLL files from ..\zeranoe.com\shared\bin to the directory of the FFmpegApp.exe binary
 int _tmain(int argc, _TCHAR* argv[])
 {

trunk/Utilities/FFmpeg/FFmpegApp/FFmpegApp.sln

@@ -1 +1 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+# Visual Studio 2013
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FFmpegApp", "FFmpegApp.vcxproj", "{7F308D39-6E31-4021-AF44-036A37ABE53A}"
 EndProject

trunk/Utilities/FFmpeg/FFmpegApp/FFmpegApp.vcxproj

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -21 +21 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -27 +28 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -51 +53 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;.\dev\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..\zeranoe.com\dev\include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>.;..\zeranoe.com\dev\lib</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -69 +70 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;.\dev\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..\zeranoe.com\dev\include</AdditionalIncludeDirectories>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
@@ -82 +83 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>.;..\zeranoe.com\dev\lib</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>

@@ -2 +2 @@
 *.user
 *.suo
+Debug