Revert 42727 - ffmpeg roll chromium binaries...

media/tools/media_bench/media_bench.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Standalone benchmarking application based on FFmpeg.  This tool is used to
 // measure decoding performance between different FFmpeg compile and run-time
 // options.  We also use this tool to measure performance regressions when
 // testing newer builds of FFmpeg from trunk.
 
 #include "build/build_config.h"
@@ skipping 454 matching lines @@
               }
             }
           }
         }
       } else {
         NOTREACHED();
       }
 
       // 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.
     av_free_packet(&packet);
 
     if (max_frames && (frames >= max_frames))
       break;
   } while (read_result >= 0);
   base::TimeDelta total = base::TimeTicks::HighResNow() - start;
   LeaveTimingSection();
@@ skipping 57 matching lines @@
 #if defined(OS_WIN)
   } __except(EXCEPTION_EXECUTE_HANDLER) {
     *log_out << "  Exception:" << std::setw(11) << GetExceptionCode()
              << " " << in_path << std::endl;
     return 1;
   }
 #endif
   CommandLine::Reset();
   return 0;
 }