summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorihf@chromium.org <ihf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-22 04:41:55 +0000
committerihf@chromium.org <ihf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-22 04:41:55 +0000
commit2e1ec6c0a19cfabd960ec73c666d92d4cc9ccce5 (patch)
tree6b93d9061b894a80953773438e2abf80d3d5bcbd /media
parent32766dc4c5d086b79f28b47e343c6d3cc8c6ecd9 (diff)
downloadchromium_src-2e1ec6c0a19cfabd960ec73c666d92d4cc9ccce5.zip
chromium_src-2e1ec6c0a19cfabd960ec73c666d92d4cc9ccce5.tar.gz
chromium_src-2e1ec6c0a19cfabd960ec73c666d92d4cc9ccce5.tar.bz2
Rev DEPS to July ffmpeg drop.
Add CrOS 3gp and flac media files. Fix media_bench. BUG=88696, 88436, 88850 and CrOS:17352,16026,17380 TESTS=ran videos on mario and tegra Review URL: http://codereview.chromium.org/7398011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93551 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/video/ffmpeg_video_decode_engine.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/video/ffmpeg_video_decode_engine.cc b/media/video/ffmpeg_video_decode_engine.cc
index 45319f4..51522c5 100644
--- a/media/video/ffmpeg_video_decode_engine.cc
+++ b/media/video/ffmpeg_video_decode_engine.cc
@@ -86,6 +86,7 @@ void FFmpegVideoDecodeEngine::Initialize(
// TODO(fbarchard): Improve thread logic based on size / codec.
// TODO(fbarchard): Fix bug affecting video-cookie.html
+ // 07/21/11(ihf): Still about 20 failures when enabling.
int decode_threads = (codec_context_->codec_id == CODEC_ID_THEORA) ?
1 : kDecodeThreads;