Fix media code to work with new ffmpeg.

media/webm/webm_stream_parser.cc

 // Copyright (c) 2012 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.
 
 #include "media/webm/webm_stream_parser.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/ffmpeg_glue.h"
@@ skipping 28 matching lines @@
   AudioDecoderConfig audio_config_;
   VideoDecoderConfig video_config_;
 
   // Backing buffer for |url_protocol_|.
   scoped_array<uint8> url_protocol_buffer_;
 
   // Protocol used by |format_context_|. It must outlive the context object.
   scoped_ptr<FFmpegURLProtocol> url_protocol_;
 
   // FFmpeg format context for this demuxer. It is created by
-  // av_open_input_file() during demuxer initialization and cleaned up with
+  // avformat_open_input() during demuxer initialization and cleaned up with
   // DestroyAVFormatContext() in the destructor.
   AVFormatContext* format_context_;
 
   static const uint8 kWebMHeader[];
   static const int kSegmentSizeOffset;
   static const uint8 kEmptyCluster[];
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegConfigHelper);
 };
 
@@ skipping 72 matching lines @@
       GG_LONGLONG(0x0100000000000000);
   for (int i = 0; i < 8; i++) {
     buf[kSegmentSizeOffset + i] = (tmp >> (8 * (7 - i))) & 0xff;
   }
 
   url_protocol_.reset(new InMemoryUrlProtocol(buf, buf_size, true));
   std::string key = FFmpegGlue::GetInstance()->AddProtocol(url_protocol_.get());
 
   // Open FFmpeg AVFormatContext.
   AVFormatContext* context = NULL;
-  int result = av_open_input_file(&context, key.c_str(), NULL, 0, NULL);
+  int result = avformat_open_input(&context, key.c_str(), NULL, NULL);
 
   if (result < 0)
     return NULL;
 
   return context;
 }
 
 bool FFmpegConfigHelper::SetupStreamConfigs() {
-  int result = av_find_stream_info(format_context_);
+  int result = avformat_find_stream_info(format_context_, NULL);
 
   if (result < 0)
     return false;
 
   bool no_supported_streams = true;
   for (size_t i = 0; i < format_context_->nb_streams; ++i) {
     AVStream* stream = format_context_->streams[i];
     AVCodecContext* codec_context = stream->codec;
     AVMediaType codec_type = codec_context->codec_type;
 
@@ skipping 181 matching lines @@
   if (!audio_buffers.empty() && !host_->OnAudioBuffers(audio_buffers))
     return -1;
 
   if (!video_buffers.empty() && !host_->OnVideoBuffers(video_buffers))
     return -1;
 
   return bytes_parsed;
 }
 
 }  // namespace media