Fix media code to work with new ffmpeg.

media/ffmpeg/file_protocol.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/ffmpeg/file_protocol.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <io.h>
@@ skipping 30 matching lines @@
 
   int f = open(filename, access, 0666);
   if (f == -1)
     return AVERROR(ENOENT);
 
   h->priv_data = reinterpret_cast<void*>(static_cast<intptr_t>(f));
   h->is_streamed = false;
   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) {
   return HANDLE_EINTR(read(GetHandle(h), buf, size));
 }
 
 #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 68, 0)
 static int WriteContext(URLContext* h, const unsigned char* buf, int size) {
 #else
 static int WriteContext(URLContext* h, unsigned char* buf, int size) {
 #endif
   return HANDLE_EINTR(write(GetHandle(h), buf, size));
@@ skipping 10 matching lines @@
 
 static int CloseContext(URLContext* h) {
   return HANDLE_EINTR(close(GetHandle(h)));
 }
 
 MSVC_POP_WARNING()
 
 URLProtocol kFFmpegFileProtocol = {
   "file",
   &OpenContext,
+  &Open2Context,

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

is it acceptable to leave this as NULL?

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

Done. Seemed to work fine.

   &ReadContext,
   &WriteContext,
   &SeekContext,
   &CloseContext,
   NULL,  // *next
   NULL,  // url_read_pause
   NULL,  // url_read_seek
   &GetHandle
 };