summaryrefslogtreecommitdiffstats
path: root/third_party/ffmpeg/ffmpeg.gyp
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/ffmpeg/ffmpeg.gyp')
-rw-r--r--third_party/ffmpeg/ffmpeg.gyp10
1 files changed, 6 insertions, 4 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index 3184745..63a4d00 100644
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -61,7 +61,7 @@
['(OS!="linux" and OS!="freebsd" and OS!="openbsd" and OS!="solaris" and OS!="mac") or use_system_ffmpeg!=0', {
'variables': {
'target_for_binaries': 'ffmpeg_binaries',
- 'ffmpeg_include_root': 'include',
+ 'ffmpeg_include_root': 'source/patched-ffmpeg-mt',
},
},{ # else OS=="linux"
'variables': {
@@ -136,7 +136,7 @@
'include_dirs': [
'source/config/<(ffmpeg_branding)/<(OS)/<(ffmpeg_config)',
'source/patched-ffmpeg-mt',
- 'source/config',
+ 'source/config',
],
'defines': [
'HAVE_AV_CONFIG_H',
@@ -642,7 +642,8 @@
'hard_dependency': 1,
'direct_dependent_settings': {
'include_dirs': [
- 'include',
+ 'source/patched-ffmpeg-mt',
+ 'source/config',
],
},
'conditions': [
@@ -708,7 +709,8 @@
},
'type': '<(library)',
'include_dirs': [
- 'include',
+ 'source/patched-ffmpeg-mt',
+ 'source/config',
'<(output_root)',
'../..', # The chromium 'src' directory.
],