diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-20 19:47:26 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-20 19:47:26 +0000 |
| commit | d2c7d860365e3f2684ecfc60c44be7758c560464 (patch) | |
| tree | 6cfd473d198732b4e2c7154c466a227adefbcbd4 /third_party | |
| parent | dc8b223f8c602c2acfdf41c228706fd7bf768de7 (diff) | |
| download | chromium_src-d2c7d860365e3f2684ecfc60c44be7758c560464.zip chromium_src-d2c7d860365e3f2684ecfc60c44be7758c560464.tar.gz chromium_src-d2c7d860365e3f2684ecfc60c44be7758c560464.tar.bz2 | |
Roll DEPS for libvpx and enable VP8/WebM for Chromium ARM builds.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47832 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/ffmpeg/ffmpeg.gyp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index 0a6aa8a..aaa7816 100644 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -328,10 +328,6 @@ 'source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_armv5te.S', 'source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_armv6.S', ], - # TODO(scherkus): Temporary until libvpx compiles on ARM. - 'sources!': [ - 'source/patched-ffmpeg-mt/libavcodec/libvpxdec.c', - ], 'conditions': [ ['arm_neon==1', { 'sources': [ @@ -386,18 +382,13 @@ 'ldflags': [ '-Wl,-Bsymbolic', '-L<(shared_generated_dir)', - '-L<(libvpx_hack_dir)/lib/<(OS)/<(target_arch)', + '-L<(libvpx_hack_dir)/lib/<(OS)/<(ffmpeg_config)', ], 'libraries': [ + '-lvpx', '-lz', ], 'conditions': [ - ['target_arch!="arm"', { - 'libraries': [ - # TODO(scherkus): Temporary until libvpx compiles on ARM. - '-lvpx', - ], - }], ['ffmpeg_asm_lib==1', { 'libraries': [ # TODO(ajwong): When scons is dead, collapse this with the @@ -415,7 +406,7 @@ # # http://code.google.com/p/gyp/issues/detail?id=108 '<(shared_generated_dir)/<(STATIC_LIB_PREFIX)<(asm_library)<(STATIC_LIB_SUFFIX)', - '<(libvpx_hack_dir)/lib/<(OS)/<(target_arch)/libvpx.a', + '<(libvpx_hack_dir)/lib/<(OS)/<(ffmpeg_config)/libvpx.a', ], 'link_settings': { 'libraries': [ |