diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-06 19:43:18 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-06 19:43:18 +0000 |
| commit | 58e3cf54f83b5c3602b3cba79ff9983151ea1db1 (patch) | |
| tree | 9be1b2df3561e897b8b4b4d0b6fcd037d2584f58 /media | |
| parent | 60060d6ceca5f27deaeb57b4ac1876a8ef9cf551 (diff) | |
| download | chromium_src-58e3cf54f83b5c3602b3cba79ff9983151ea1db1.zip chromium_src-58e3cf54f83b5c3602b3cba79ff9983151ea1db1.tar.gz chromium_src-58e3cf54f83b5c3602b3cba79ff9983151ea1db1.tar.bz2 | |
Make media targets work with the shared library build for Android.
It looks like gpu_video_decoder has been refactored to not depend on
ffmpeg and is required for the shared library build.
BUG=158821
Review URL: https://chromiumcodereview.appspot.com/11362107
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166249 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/filters/gpu_video_decoder.cc | 1 | ||||
| -rw-r--r-- | media/media.gyp | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/media/filters/gpu_video_decoder.cc b/media/filters/gpu_video_decoder.cc index 9fdf9de..092e127 100644 --- a/media/filters/gpu_video_decoder.cc +++ b/media/filters/gpu_video_decoder.cc @@ -14,7 +14,6 @@ #include "media/base/pipeline.h" #include "media/base/pipeline_status.h" #include "media/base/video_decoder_config.h" -#include "media/ffmpeg/ffmpeg_common.h" namespace media { diff --git a/media/media.gyp b/media/media.gyp index afd48be..2031926 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -156,8 +156,6 @@ 'audio/win/waveout_output_win.h', 'base/android/cookie_getter.cc', 'base/android/cookie_getter.h', - 'base/android/media_jni_registrar.cc', - 'base/android/media_jni_registrar.h', 'base/android/media_player_bridge_manager.cc', 'base/android/media_player_bridge_manager.h', 'base/audio_decoder.cc', @@ -377,8 +375,6 @@ 'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h', 'filters/ffmpeg_video_decoder.cc', 'filters/ffmpeg_video_decoder.h', - 'filters/gpu_video_decoder.cc', - 'filters/gpu_video_decoder.h', 'webm/webm_cluster_parser.cc', 'webm/webm_cluster_parser.h', 'webm/webm_stream_parser.cc', @@ -1198,6 +1194,8 @@ 'target_name': 'player_android', 'type': 'static_library', 'sources': [ + 'base/android/media_jni_registrar.cc', + 'base/android/media_jni_registrar.h', 'base/android/media_player_bridge.cc', 'base/android/media_player_bridge.h', 'base/android/media_player_listener.cc', |