From 808663e89da849cd5192bf04b1757975b7fba0f2 Mon Sep 17 00:00:00 2001 From: "scherkus@chromium.org" Date: Tue, 30 Mar 2010 00:33:16 +0000 Subject: Fix use_system_ffmpeg and clean up ffmpeg.gyp To make use_system_ffmpeg work more correctly, we now use the system include path for headers and make use of the version number macros to determine the shared library names. Also removed a bunch of cruft without breaking anything on Windows, Mac or Linux. BUG=23602, 39430 TEST=ffmpeg should still work both with and without use_system_ffmpeg Review URL: http://codereview.chromium.org/1503002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43030 0039d316-1c4b-4281-b951-d872f2087c98 --- media/ffmpeg/ffmpeg_common.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'media/ffmpeg/ffmpeg_common.h') diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h index 4b60046..555eb9a 100644 --- a/media/ffmpeg/ffmpeg_common.h +++ b/media/ffmpeg/ffmpeg_common.h @@ -19,9 +19,10 @@ extern "C" { // Temporarily disable possible loss of data warning. // TODO(scherkus): fix and upstream the compiler warnings. MSVC_PUSH_DISABLE_WARNING(4244); -#include "third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/avcodec.h" -#include "third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/avformat.h" -#include "third_party/ffmpeg/source/patched-ffmpeg-mt/libavutil/log.h" +#include +#include +#include +#include MSVC_POP_WARNING(); } // extern "C" -- cgit v1.1