Fix media code to work with new ffmpeg.

media/filters/ffmpeg_glue.h

 // Copyright (c) 2011 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.
 
 // FFmpegGlue is an adapter for FFmpeg's URLProtocol interface that allows us to
 // use a DataSource implementation with FFmpeg. For convenience we use FFmpeg's
-// av_open_input_file function, which analyzes the filename given to it and
+// avformat_open_input function, which analyzes the filename given to it and

[scherkus (not reviewing), 2012/02/06 21:13:49]

nit: mind annotating the function calls in comments w/ () at the end of them?

it's a loosely enforced style we use to help distinguish variable names from
functions

[DaleCurtis, 2012/02/07 19:09:13]

Done.

 // automatically initializes the appropriate URLProtocol.
 //
-// Since the DataSource is already open by time we call av_open_input_file, we
-// need a way for av_open_input_file to find the correct DataSource instance.
+// Since the DataSource is already open by time we call avformat_open_input, we
+// need a way for avformat_open_input to find the correct DataSource instance.
 // The solution is to maintain a map of "filenames" to DataSource instances,
 // where filenames are actually just a unique identifier.  For simplicity,
 // FFmpegGlue is registered as an HTTP handler and generates filenames based on
 // the memory address of the DataSource, i.e., http://0xc0bf4870.  Since there
 // may be multiple FFmpegDemuxers active at one time, FFmpegGlue is a
 // thread-safe singleton.
 //
 // Usage: FFmpegDemuxer adds the DataSource to FFmpegGlue's map and is given a
-// filename to pass to av_open_input_file.  FFmpegDemuxer calls
-// av_open_input_file with the filename, which results in FFmpegGlue returning
+// filename to pass to avformat_open_input.  FFmpegDemuxer calls
+// avformat_open_input with the filename, which results in FFmpegGlue returning
 // the DataSource as a URLProtocol instance to FFmpeg.  Since FFmpegGlue is only
-// needed for opening files, when av_open_input_file returns FFmpegDemuxer
+// needed for opening files, when avformat_open_input returns FFmpegDemuxer
 // removes the DataSource from FFmpegGlue's map.
 
 #ifndef MEDIA_FILTERS_FFMPEG_GLUE_H_
 #define MEDIA_FILTERS_FFMPEG_GLUE_H_
 
 #include <map>
 #include <string>
 
 #include "base/memory/singleton.h"
 #include "base/synchronization/lock.h"
@@ skipping 49 matching lines @@
   void GetProtocol(const std::string& key,
                    FFmpegURLProtocol** protocol);
 
  private:
   // Only allow Singleton to create and delete FFmpegGlue.
   friend struct DefaultSingletonTraits<FFmpegGlue>;
   FFmpegGlue();
   virtual ~FFmpegGlue();
 
   // Returns the unique key for this data source, which can be passed to
-  // av_open_input_file as the filename.
+  // avformat_open_input as the filename.
   std::string GetProtocolKey(FFmpegURLProtocol* protocol);
 
   // Mutual exclusion while adding/removing items from the map.
   base::Lock lock_;
 
   // Map between keys and FFmpegProtocol references.
   typedef std::map<std::string, FFmpegURLProtocol*> ProtocolMap;
   ProtocolMap protocols_;
 
   friend class FFmpegGlueTest;
   static URLProtocol* url_protocol();
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegGlue);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_GLUE_H_