diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-07 06:02:31 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-07 06:02:31 +0000 |
| commit | 16ee721c4e742ea7bdbe7cddc772243c81f04baf (patch) | |
| tree | a2e8272c3d6dcb469a5fb9de14639ab4a83775e1 /third_party | |
| parent | ded8be493ca5711484b288e2a8f2652b1720abec (diff) | |
| download | chromium_src-16ee721c4e742ea7bdbe7cddc772243c81f04baf.zip chromium_src-16ee721c4e742ea7bdbe7cddc772243c81f04baf.tar.gz chromium_src-16ee721c4e742ea7bdbe7cddc772243c81f04baf.tar.bz2 | |
ffmpeg fix for neon
BUG=none
TEST=NONE
Review URL: http://codereview.chromium.org/1617009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43809 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/ffmpeg/ffmpeg.gyp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index 7426aa5..9f056b7 100644 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -304,9 +304,6 @@ 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_armv6.c', 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_vfp.c', 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_vfp.S', - 'source/patched-ffmpeg-mt/libavcodec/arm/h264dsp_init_arm.c', # TODO(fbarchard): Roll5 Review this file. - 'source/patched-ffmpeg-mt/libavcodec/arm/h264pred_init_arm.c', - 'source/patched-ffmpeg-mt/libavcodec/rdft.c', 'source/patched-ffmpeg-mt/libavcodec/arm/fft_init_arm.c', # TODO(fbarchard): Review this file. 'source/patched-ffmpeg-mt/libavcodec/arm/jrevdct_arm.S', 'source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_arm.S', @@ -330,6 +327,7 @@ }], # target_arch=="arm" ['target_arch=="arm" and (ffmpeg_branding=="Chrome" or ffmpeg_branding=="ChromeOS")', { 'sources': [ + 'source/patched-ffmpeg-mt/libavcodec/arm/h264dsp_init_arm.c', # TODO(fbarchard): Roll5 Review this file. 'source/patched-ffmpeg-mt/libavcodec/arm/mpegvideo_arm.c', 'source/patched-ffmpeg-mt/libavcodec/arm/mpegvideo_armv5te.c', 'source/patched-ffmpeg-mt/libavcodec/arm/mpegvideo_armv5te_s.S', @@ -337,9 +335,9 @@ 'conditions': [ ['arm_neon==1', { 'sources': [ - 'source/patched-ffmpeg-mt/libavcodec/arm/h264dsp_init_arm.c', # TODO(fbarchard): Roll5 Review this file. 'source/patched-ffmpeg-mt/libavcodec/arm/h264dsp_neon.S', 'source/patched-ffmpeg-mt/libavcodec/arm/h264idct_neon.S', + 'source/patched-ffmpeg-mt/libavcodec/arm/h264pred_init_arm.c', 'source/patched-ffmpeg-mt/libavcodec/arm/h264pred_neon.S', ], }], |