diff options
| author | Casimir666 <casimir666@users.sourceforge.net> | 2009-04-18 21:39:19 +0400 |
|---|---|---|
| committer | Casimir666 <casimir666@users.sourceforge.net> | 2009-04-18 21:39:19 +0400 |
| commit | 530c6354edabdd19d45d883fee88793664170adf (patch) | |
| tree | d1fcf2a4b371465f0c20201a52f33db6367688e7 /src/filters/transform/mpadecfilter/faad2 | |
| parent | f39d30c0b2eba6db09f1d3f66be6fd1eb2d7f5a5 (diff) | |
Changed : merge with Beliyaal branch
Added : support for madVR (new Video Renderer)
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1048 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/mpadecfilter/faad2')
3 files changed, 8 insertions, 1 deletions
diff --git a/src/filters/transform/mpadecfilter/faad2/libfaad/libfaad.vcproj b/src/filters/transform/mpadecfilter/faad2/libfaad/libfaad.vcproj index df1a27ab2..904c5eb1f 100644 --- a/src/filters/transform/mpadecfilter/faad2/libfaad/libfaad.vcproj +++ b/src/filters/transform/mpadecfilter/faad2/libfaad/libfaad.vcproj @@ -47,6 +47,7 @@ AdditionalIncludeDirectories="..\include"
PreprocessorDefinitions="NDEBUG;WIN32;_LIB"
PrecompiledHeaderFile=".\Release\libfaad.pch"
+ WarningLevel="2"
DisableSpecificWarnings="4244"
/>
<Tool
@@ -113,6 +114,7 @@ AdditionalIncludeDirectories="..\include"
PreprocessorDefinitions="_WIN64;NDEBUG;_LIB"
PrecompiledHeaderFile=".\Release\libfaad.pch"
+ WarningLevel="2"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -171,10 +173,11 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions=""
+ AdditionalOptions="/MP"
AdditionalIncludeDirectories="..\include"
PreprocessorDefinitions="_DEBUG;WIN32;_LIB"
PrecompiledHeaderFile=".\Debug\libfaad.pch"
+ WarningLevel="2"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -240,6 +243,7 @@ AdditionalIncludeDirectories="..\include"
PreprocessorDefinitions="_WIN64;_LIB;_DEBUG"
PrecompiledHeaderFile=".\Debug\libfaad.pch"
+ WarningLevel="2"
DebugInformationFormat="3"
/>
<Tool
diff --git a/src/filters/transform/mpadecfilter/faad2/libfaad/mp4.c b/src/filters/transform/mpadecfilter/faad2/libfaad/mp4.c index 72b2af6ce..c8c8fa8ba 100644 --- a/src/filters/transform/mpadecfilter/faad2/libfaad/mp4.c +++ b/src/filters/transform/mpadecfilter/faad2/libfaad/mp4.c @@ -32,6 +32,7 @@ #include "structs.h" #include <stdlib.h> +#include <memory.h> #include "bits.h" #include "mp4.h" diff --git a/src/filters/transform/mpadecfilter/faad2/libfaad/ps_dec.c b/src/filters/transform/mpadecfilter/faad2/libfaad/ps_dec.c index 6d9c7be90..e7b87f8f2 100644 --- a/src/filters/transform/mpadecfilter/faad2/libfaad/ps_dec.c +++ b/src/filters/transform/mpadecfilter/faad2/libfaad/ps_dec.c @@ -33,6 +33,8 @@ #ifdef PS_DEC #include <stdlib.h> +#include <memory.h> + #include "ps_dec.h" #include "ps_tables.h" |