| Index: third_party/ffmpeg/ffmpeg.gyp
|
| diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
|
| index 947aa34b178fba27fbaf533ba7b55d18ea502e92..64cf546e608fcf4195825dcdac98e7910383f277 100755
|
| --- a/third_party/ffmpeg/ffmpeg.gyp
|
| +++ b/third_party/ffmpeg/ffmpeg.gyp
|
| @@ -43,7 +43,7 @@
|
| },
|
| },{ # else OS=="linux"
|
| 'variables': {
|
| - 'target_for_binaries': 'ffmpegsumo_nolink',
|
| + 'target_for_binaries': 'ffmpeg_binaries',
|
| 'ffmpeg_include_root': 'source/patched-ffmpeg-mt',
|
| },
|
| 'targets': [
|
| @@ -560,7 +560,13 @@
|
| 'variables': {
|
| # TODO(ajwong): Clean this up after we've finished
|
| # migrating to in-tree build.
|
| - 'source_files': [],
|
| + 'source_files': [
|
| + # TODO(ajwong): Temporary revert to make tree green while
|
| + # builder libraries are updated.
|
| + 'binaries/<(ffmpeg_bin_dir)/libavcodec.so.52',
|
| + 'binaries/<(ffmpeg_bin_dir)/libavformat.so.52',
|
| + 'binaries/<(ffmpeg_bin_dir)/libavutil.so.50',
|
| + ],
|
| },
|
| }], ['OS=="mac"', {
|
| # TODO(ajwong): These files are also copied in:
|
|
|