diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 00:33:16 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 00:33:16 +0000 |
| commit | 808663e89da849cd5192bf04b1757975b7fba0f2 (patch) | |
| tree | 2b357127fbda563822764371ed98236eb01d60bd /media/ffmpeg | |
| parent | 1082b1dd85c92e5260911989d8022988bacb676e (diff) | |
| download | chromium_src-808663e89da849cd5192bf04b1757975b7fba0f2.zip chromium_src-808663e89da849cd5192bf04b1757975b7fba0f2.tar.gz chromium_src-808663e89da849cd5192bf04b1757975b7fba0f2.tar.bz2 | |
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
Diffstat (limited to 'media/ffmpeg')
| -rw-r--r-- | media/ffmpeg/ffmpeg_common.h | 7 |
1 files changed, 4 insertions, 3 deletions
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 <libavcodec/avcodec.h> +#include <libavformat/avformat.h> +#include <libavutil/avutil.h> +#include <libavutil/log.h> MSVC_POP_WARNING(); } // extern "C" |