New FFmpeg public API headers to match our source tarball in deps.

media/bench/bench.cc

 // Copyright (c) 2009 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 <iomanip>
@@ skipping 171 matching lines @@
 
   // Parse through the entire stream until we hit EOF.
   base::TimeTicks start = base::TimeTicks::HighResNow();
   while (av_read_frame(format_context, &packet) >= 0) {
     // Only decode packets from our target stream.
     if (packet.stream_index == target_stream) {
       int result = -1;
       base::TimeTicks decode_start = base::TimeTicks::HighResNow();
       if (target_codec == CODEC_TYPE_AUDIO) {
         int size_out = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-        result = avcodec_decode_audio2(codec_context, samples, &size_out,
-                                       packet.data, packet.size);
+        result = avcodec_decode_audio3(codec_context, samples, &size_out,
+                                       &packet);
       } else if (target_codec == CODEC_TYPE_VIDEO) {
         int got_picture = 0;
-        result = avcodec_decode_video(codec_context, frame, &got_picture,
-                                      packet.data, packet.size);
+        result = avcodec_decode_video2(codec_context, frame, &got_picture,
+                                       &packet);
       } else {
         NOTREACHED();
       }
       base::TimeDelta delta = base::TimeTicks::HighResNow() - decode_start;
       decode_times.push_back(delta.InMillisecondsF());
 
       // Make sure our decoding went OK.
       if (result < 0) {
         std::cerr << "Error while decoding" << std::endl;
         return 1;
@@ skipping 34 matching lines @@
   std::cout << "      Total:" << std::setw(10) << total.InMillisecondsF()
             << " ms" << std::endl;
   std::cout << "  Summation:" << std::setw(10) << sum
             << " ms" << std::endl;
   std::cout << "    Average:" << std::setw(10) << average
             << " ms" << std::endl;
   std::cout << "     StdDev:" << std::setw(10) << stddev
             << " ms" << std::endl;
   return 0;
 }