summaryrefslogtreecommitdiffstats
path: root/media/media.gyp
diff options
context:
space:
mode:
authorwjia@google.com <wjia@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-28 16:36:30 +0000
committerwjia@google.com <wjia@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-28 16:36:30 +0000
commitd665492fca06d19d2cd5abc5913f7eacd3ea558b (patch)
treec2b2abfd55feed8006d0e7efe5f22ce1073218b1 /media/media.gyp
parent98cfec7aec302ecfd1942df3b83c8e48add82413 (diff)
downloadchromium_src-d665492fca06d19d2cd5abc5913f7eacd3ea558b.zip
chromium_src-d665492fca06d19d2cd5abc5913f7eacd3ea558b.tar.gz
chromium_src-d665492fca06d19d2cd5abc5913f7eacd3ea558b.tar.bz2
Remove omx_codec since OMX client implementation is in omx_video_decode_engine. Update omx_test to use omx_video_decode_engine.
Contributed by wjia@chromium.org BUG=none TEST=tested on tegra Review URL: http://codereview.chromium.org/2255005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48492 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
-rw-r--r--media/media.gyp6
1 files changed, 4 insertions, 2 deletions
diff --git a/media/media.gyp b/media/media.gyp
index c705823..6821aac 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -334,10 +334,12 @@
'dependencies': [
'../base/base.gyp:base',
'../third_party/openmax/openmax.gyp:il',
+ # TODO(wjia): remove ffmpeg
+ '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
],
'sources': [
- 'omx/omx_codec.cc',
- 'omx/omx_codec.h',
+ 'filters/omx_video_decode_engine.cc',
+ 'filters/omx_video_decode_engine.cc',
'omx/omx_configurator.cc',
'omx/omx_configurator.h',
],