Fix media code to work with new ffmpeg.

media/filters/ffmpeg_glue.cc

 // 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.
 
 #include "media/filters/ffmpeg_glue.h"
 
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "media/base/filters.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 
 namespace media {
 
 static FFmpegURLProtocol* ToProtocol(void* data) {
   return reinterpret_cast<FFmpegURLProtocol*>(data);
 }
 
 // FFmpeg protocol interface.
 static int OpenContext(URLContext* h, const char* filename, int flags) {
   FFmpegURLProtocol* protocol;
   FFmpegGlue::GetInstance()->GetProtocol(filename, &protocol);
   if (!protocol)
     return AVERROR(EIO);
 
   h->priv_data = protocol;
-  h->flags = URL_RDONLY;
+  h->flags = AVIO_FLAG_READ;
   h->is_streamed = protocol->IsStreaming();
   return 0;
 }
 
+static int Open2Context(URLContext* h, const char* filename, int flags,
+                        AVDictionary **options) {
+  // TODO(dalecurtis): This is probably not right...
+  return OpenContext(h, filename, flags);
+}
+
 static int ReadContext(URLContext* h, unsigned char* buf, int size) {
   FFmpegURLProtocol* protocol = ToProtocol(h->priv_data);
   int result = protocol->Read(size, buf);
   if (result < 0)
     result = AVERROR(EIO);
   return result;
 }
 
 #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 68, 0)
 static int WriteContext(URLContext* h, const unsigned char* buf, int size) {
@@ skipping 70 matching lines @@
   return 1;
 }
 
 // Use the HTTP protocol to avoid any file path separator issues.
 static const char kProtocol[] = "http";
 
 // Fill out our FFmpeg protocol definition.
 static URLProtocol kFFmpegURLProtocol = {
   kProtocol,
   &OpenContext,
+  &Open2Context,

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

ditto for NULL here

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

Done.

   &ReadContext,
   &WriteContext,
   &SeekContext,
   &CloseContext,
 };
 
 FFmpegGlue::FFmpegGlue() {
   // Before doing anything disable logging as it interferes with layout tests.
   av_log_set_level(AV_LOG_QUIET);
 
   // Register our protocol glue code with FFmpeg.
-  avcodec_init();
-  av_register_protocol2(&kFFmpegURLProtocol, sizeof(kFFmpegURLProtocol));
+  ffurl_register_protocol(&kFFmpegURLProtocol, sizeof(kFFmpegURLProtocol));
   av_lockmgr_register(&LockManagerOperation);
 
   // Now register the rest of FFmpeg.
   av_register_all();
 }
 
 FFmpegGlue::~FFmpegGlue() {
   av_lockmgr_register(NULL);
 }
 
@@ skipping 40 matching lines @@
 }
 
 std::string FFmpegGlue::GetProtocolKey(FFmpegURLProtocol* protocol) {
   // Use the FFmpegURLProtocol's memory address to generate the unique string.
   // This also has the nice property that adding the same FFmpegURLProtocol
   // reference will not generate duplicate entries.
   return base::StringPrintf("%s://%p", kProtocol, static_cast<void*>(protocol));
 }
 
 }  // namespace media