Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Unified Diff: media/ffmpeg/file_protocol.cc

Issue 9317096: Fix media code to work with new ffmpeg. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix deprecated methods. Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/ffmpeg/file_protocol.cc
diff --git a/media/ffmpeg/file_protocol.cc b/media/ffmpeg/file_protocol.cc
index 26ba8ce93513a84e859bfa89c12715a64c6c047a..b3542be143c2be6e781e30039dd0f742e9c56f80 100644
--- a/media/ffmpeg/file_protocol.cc
+++ b/media/ffmpeg/file_protocol.cc
@@ -48,6 +48,12 @@ static int OpenContext(URLContext* h, const char* filename, int flags) {
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));
}
@@ -78,6 +84,7 @@ 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,

Powered by Google App Engine
This is Rietveld 408576698