summaryrefslogtreecommitdiff
path: root/libvpx.gyp
diff options
context:
space:
mode:
authorfgalligan@chromium.org <fgalligan@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2013-06-13 15:32:29 +0000
committerfgalligan@chromium.org <fgalligan@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2013-06-13 15:32:29 +0000
commitf7b25aef0ed571110c9f656f29ead07b02d33d89 (patch)
tree6b8189ea04bab1ff4e6a8a5f2fb751d9c17e11e7 /libvpx.gyp
parent9317728b1000351b129816f2945bbcbb48add326 (diff)
downloadlibvpx-f7b25aef0ed571110c9f656f29ead07b02d33d89.tar.gz
libvpx: Pull from upstream
Current HEAD: a81bd12a2e3df637fb240e4d478d74e34d121043 - Update libvpx.gyp to pull in thumb.pm. git log from upstream: a81bd12 Quick modifications to mb loopfilter intrinsic functions d682243 Merge "Quick modifications to wide loopfilter intrinsic functions" fa96eeb Implement SSE version for sad4x8x4d and SSE2 version for sad8x4x4d. 26496c5 Quick modifications to wide loopfilter intrinsic functions BUG=165504 TBR=hclam, johannkoenig Review URL: https://codereview.chromium.org/16970002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@206072 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'libvpx.gyp')
-rw-r--r--libvpx.gyp2
1 files changed, 2 insertions, 0 deletions
diff --git a/libvpx.gyp b/libvpx.gyp
index 7db89c2..d312116 100644
--- a/libvpx.gyp
+++ b/libvpx.gyp
@@ -204,6 +204,7 @@
'destination': '<(shared_generated_dir)',
'files': [
'<(ads2gas_script_path)',
+ '<(ads2gas_script_include)',
],
}],
@@ -233,6 +234,7 @@
# Location of the assembly conversion script.
'ads2gas_script': 'ads2gas.pl',
'ads2gas_script_path': '<(libvpx_source)/build/make/<(ads2gas_script)',
+ 'ads2gas_script_include': '<(libvpx_source)/build/make/thumb.pm',
},
'cflags': [
# We need to explicitly tell the GCC assembler to look for