summaryrefslogtreecommitdiffstats
path: root/third_party/ffmpeg/using_ffmpeg.vsprops
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-19 22:19:21 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-19 22:19:21 +0000
commit2ba1c6cfc414c52b3798e18de01ecf24ae8c5e59 (patch)
treee272e785ca53e82de6cca1fbb54754ee3b5ba2b8 /third_party/ffmpeg/using_ffmpeg.vsprops
parentea5b8bb0dd358836695f6e8521be995adbe6e54c (diff)
downloadchromium_src-2ba1c6cfc414c52b3798e18de01ecf24ae8c5e59.zip
chromium_src-2ba1c6cfc414c52b3798e18de01ecf24ae8c5e59.tar.gz
chromium_src-2ba1c6cfc414c52b3798e18de01ecf24ae8c5e59.tar.bz2
Check in C99 compatibility headers for MSVC and FFmpeg.
MSVC doesn't include <stdint.h> and <inttypes.h>, so in order for MSVC to include FFmpeg headers we need to provide them. The headers aren't complete, but contain the bare minimum for compatibility. Although we could add these types to base/basictypes.h, I'm afraid of people using C99 types by accident (uint8_t instead of uint8). Also, base/basictypes.h includes C++ code which makes including it from an extern "C" section problematic. Review URL: http://codereview.chromium.org/21521 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10048 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/ffmpeg/using_ffmpeg.vsprops')
-rw-r--r--third_party/ffmpeg/using_ffmpeg.vsprops2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/ffmpeg/using_ffmpeg.vsprops b/third_party/ffmpeg/using_ffmpeg.vsprops
index ea674e2..e190f9f 100644
--- a/third_party/ffmpeg/using_ffmpeg.vsprops
+++ b/third_party/ffmpeg/using_ffmpeg.vsprops
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(SolutionDir)..\third_party\ffmpeg\include"
+ AdditionalIncludeDirectories="$(SolutionDir)..\third_party\ffmpeg\include;$(SolutionDir)..\third_party\ffmpeg\include\win"
/>
<Tool
Name="VCLinkerTool"