diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-08-23 16:39:15 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-08-23 16:39:15 +0100 |
| commit | 3551c9c881056c480085172ff9840cab31610854 (patch) | |
| tree | 23660320f5f4c279966609cf9da7491b96d10ca8 /media/media.target.darwin-arm.mk | |
| parent | 4e9d9adbbb6cf287125ca44a0823791a570472f5 (diff) | |
| download | chromium_org-3551c9c881056c480085172ff9840cab31610854.tar.gz | |
Merge from Chromium at DEPS revision r219274
This commit was generated by merge_to_master.py.
Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d
Diffstat (limited to 'media/media.target.darwin-arm.mk')
| -rw-r--r-- | media/media.target.darwin-arm.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/media/media.target.darwin-arm.mk b/media/media.target.darwin-arm.mk index fca98f8650..b909eae982 100644 --- a/media/media.target.darwin-arm.mk +++ b/media/media.target.darwin-arm.mk @@ -31,7 +31,6 @@ LOCAL_SRC_FILES := \ media/audio/android/audio_manager_android.cc \ media/audio/android/opensles_input.cc \ media/audio/android/opensles_output.cc \ - media/audio/async_socket_io_handler_posix.cc \ media/audio/audio_buffers_state.cc \ media/audio/audio_device_name.cc \ media/audio/audio_device_thread.cc \ @@ -49,6 +48,7 @@ LOCAL_SRC_FILES := \ media/audio/audio_output_resampler.cc \ media/audio/audio_power_monitor.cc \ media/audio/audio_util.cc \ + media/audio/clockless_audio_sink.cc \ media/audio/cross_process_notification.cc \ media/audio/cross_process_notification_posix.cc \ media/audio/fake_audio_consumer.cc \ @@ -84,8 +84,8 @@ LOCAL_SRC_FILES := \ media/base/data_source.cc \ media/base/decoder_buffer.cc \ media/base/decoder_buffer_queue.cc \ - media/base/decryptor.cc \ media/base/decrypt_config.cc \ + media/base/decryptor.cc \ media/base/demuxer.cc \ media/base/demuxer_stream.cc \ media/base/djb2.cc \ @@ -108,6 +108,7 @@ LOCAL_SRC_FILES := \ media/base/sinc_resampler.cc \ media/base/stream_parser.cc \ media/base/stream_parser_buffer.cc \ + media/base/user_input_monitor.cc \ media/base/video_decoder.cc \ media/base/video_decoder_config.cc \ media/base/video_frame.cc \ @@ -123,8 +124,8 @@ LOCAL_SRC_FILES := \ media/filters/decrypting_demuxer_stream.cc \ media/filters/decrypting_video_decoder.cc \ media/filters/file_data_source.cc \ + media/filters/gpu_video_accelerator_factories.cc \ media/filters/gpu_video_decoder.cc \ - media/filters/gpu_video_decoder_factories.cc \ media/filters/h264_to_annex_b_bitstream_converter.cc \ media/filters/in_memory_url_protocol.cc \ media/filters/opus_audio_decoder.cc \ @@ -142,6 +143,7 @@ LOCAL_SRC_FILES := \ media/video/capture/video_capture_proxy.cc \ media/video/picture.cc \ media/video/video_decode_accelerator.cc \ + media/video/video_encode_accelerator.cc \ media/webm/webm_audio_client.cc \ media/webm/webm_cluster_parser.cc \ media/webm/webm_constants.cc \ @@ -214,6 +216,7 @@ MY_DEFS_Debug := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DMEDIA_IMPLEMENTATION' \ + '-DDISABLE_USER_INPUT_MONITOR' \ '-DSK_ENABLE_INST_COUNT=0' \ '-DSK_SUPPORT_GPU=1' \ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ @@ -325,6 +328,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DMEDIA_IMPLEMENTATION' \ + '-DDISABLE_USER_INPUT_MONITOR' \ '-DSK_ENABLE_INST_COUNT=0' \ '-DSK_SUPPORT_GPU=1' \ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ |