Second attempt to land ffmpeg roll.

Attempt 2 at landing http://codereview.chromium.org/9317096/

Same as before except for fixes in checkperms/

However, fixes have landed elsewhere for:
- mp3 decode issue.
- FrameRateNoVsyncCanvasInternalTest.fishbowl/0

BUG=110776
TEST=unittests, layouttests, trybots, perf tests...

Review URL: https://chromiumcodereview.appspot.com/9447029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124501 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 3 deletions

diff --git a/media/webm/webm_stream_parser.cc b/media/webm/webm_stream_parser.cc
index f1d6001..d49ed7c 100644
--- a/media/webm/webm_stream_parser.cc
+++ b/media/webm/webm_stream_parser.cc
@@ -46,7 +46,7 @@ class FFmpegConfigHelper {
   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_;
 
@@ -139,7 +139,7 @@ AVFormatContext* FFmpegConfigHelper::CreateFormatContext(const uint8* data,
 
   // 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;
@@ -148,7 +148,7 @@ AVFormatContext* FFmpegConfigHelper::CreateFormatContext(const uint8* data,
 }
 
 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;