diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 20:42:04 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 20:42:04 +0000 |
| commit | ed0047bec1d0de1f668daf6a35af62f4d377b399 (patch) | |
| tree | c6cef2e7917304b9fd50864acee94e77f2c1fb39 /third_party/ffmpeg | |
| parent | 50c5beddbb7839e02367542a58b7d43132f392f7 (diff) | |
| download | chromium_src-ed0047bec1d0de1f668daf6a35af62f4d377b399.zip chromium_src-ed0047bec1d0de1f668daf6a35af62f4d377b399.tar.gz chromium_src-ed0047bec1d0de1f668daf6a35af62f4d377b399.tar.bz2 | |
ffmpeg move a file from neon to arm section for build error
BUG=42845
TEST=arm chrome should build
Review URL: http://codereview.chromium.org/1801009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46111 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/ffmpeg')
| -rw-r--r-- | third_party/ffmpeg/ffmpeg.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index 7f42890..3242dc8 100644 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -328,6 +328,7 @@ ['target_arch=="arm" and (ffmpeg_branding=="Chrome" or ffmpeg_branding=="ChromeOS")', { 'sources': [ 'source/patched-ffmpeg-mt/libavcodec/arm/h264dsp_init_arm.c', + 'source/patched-ffmpeg-mt/libavcodec/arm/h264pred_init_arm.c', '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,7 +338,6 @@ 'sources': [ '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', ], }], |