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:29:50 +0000
committerfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-26 03:29:50 +0000
commitd803c41d9a4c8617dd0a3c197a8bf17703a109f1 (patch)
tree22eb07cb3cbbcb98c6e803bee501ea04e6a05c4e /media/tools
parent43580b3c026bfbb6d1cb8ff130bb8c375ddae994 (diff)
downloadchromium_src-d803c41d9a4c8617dd0a3c197a8bf17703a109f1.zip
chromium_src-d803c41d9a4c8617dd0a3c197a8bf17703a109f1.tar.gz
chromium_src-d803c41d9a4c8617dd0a3c197a8bf17703a109f1.tar.bz2
Revert 42727 - ffmpeg roll chromium binaries
bug=none test=none TBR=fbarchard@chromium.org Review URL: http://codereview.chromium.org/1401002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42728 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 18ac81c8..47b767b 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 << "WARNING: avcodec_decode returned "
+ std::cerr << "Error: avcodec_decode returned "
<< result << " for " << in_path << std::endl;
- // return 1;
+ return 1;
}
}
// Free our packet.