summaryrefslogtreecommitdiffstats
path: root/media/tools
diff options
context:
space:
mode:
authorfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-26 03:26:37 +0000
committerfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-26 03:26:37 +0000
commit43580b3c026bfbb6d1cb8ff130bb8c375ddae994 (patch)
treeb2b981c2c0c72141b3a8b8d21697bb621030c765 /media/tools
parent20271f35b0f02ec3c116363ef2f0357ede65608a (diff)
downloadchromium_src-43580b3c026bfbb6d1cb8ff130bb8c375ddae994.zip
chromium_src-43580b3c026bfbb6d1cb8ff130bb8c375ddae994.tar.gz
chromium_src-43580b3c026bfbb6d1cb8ff130bb8c375ddae994.tar.bz2
ffmpeg roll chromium binaries
bug=none test=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42727 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
-rw-r--r--media/tools/media_bench/media_bench.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/tools/media_bench/media_bench.cc b/media/tools/media_bench/media_bench.cc
index 47b767b..18ac81c8 100644
--- a/media/tools/media_bench/media_bench.cc
+++ b/media/tools/media_bench/media_bench.cc
@@ -472,9 +472,9 @@ int main(int argc, const char** argv) {
// Make sure our decoding went OK.
if (result < 0) {
- std::cerr << "Error: avcodec_decode returned "
+ std::cerr << "WARNING: avcodec_decode returned "
<< result << " for " << in_path << std::endl;
- return 1;
+ // return 1;
}
}
// Free our packet.