From ccd07800092c2f6337decffb62c9eb30c1d946b2 Mon Sep 17 00:00:00 2001 From: "hclam@chromium.org" Date: Fri, 1 Oct 2010 00:18:06 +0000 Subject: Resubmit - Roll DEPS to include changes to FFmpeg build system TBR=fbarchrd BUG=57266 TEST=Tree is green. ARM ffmpeg can be loaded. Review URL: http://codereview.chromium.org/3555004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61134 0039d316-1c4b-4281-b951-d872f2087c98 --- remoting/remoting.gyp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'remoting') diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 47d498c..e64624b 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -402,11 +402,13 @@ 'base/codec_test.h', 'base/compressor_zlib_unittest.cc', 'base/decoder_verbatim_unittest.cc', - 'base/decoder_vp8_unittest.cc', 'base/decoder_zlib_unittest.cc', 'base/decompressor_zlib_unittest.cc', 'base/encoder_verbatim_unittest.cc', - 'base/encoder_vp8_unittest.cc', + # These two tests are disabled due to threading problems in libvpx. + # See bug: http://crbug.com/57266 + # 'base/decoder_vp8_unittest.cc', + # 'base/encoder_vp8_unittest.cc', 'base/encoder_zlib_unittest.cc', 'base/mock_objects.h', 'base/multiple_array_input_stream_unittest.cc', -- cgit v1.1