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

Unified Diff: source/patched-ffmpeg-mt/libavformat/avio.c

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 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
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/avio.h ('k') | source/patched-ffmpeg-mt/libavformat/aviobuf.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/patched-ffmpeg-mt/libavformat/avio.c
===================================================================
--- source/patched-ffmpeg-mt/libavformat/avio.c (revision 59334)
+++ source/patched-ffmpeg-mt/libavformat/avio.c (working copy)
@@ -30,7 +30,7 @@
#include "network.h"
#endif
-#if LIBAVFORMAT_VERSION_MAJOR >= 53
+#if FF_API_URL_CLASS
/** @name Logging context. */
/*@{*/
static const char *urlcontext_to_name(void *ptr)
@@ -71,7 +71,7 @@
return 0;
}
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if FF_API_REGISTER_PROTOCOL
/* The layout of URLProtocol as of when major was bumped to 52 */
struct URLProtocol_compat {
const char *name;
@@ -109,7 +109,7 @@
err = AVERROR(ENOMEM);
goto fail;
}
-#if LIBAVFORMAT_VERSION_MAJOR >= 53
+#if FF_API_URL_CLASS
uc->av_class = &urlcontext_class;
#endif
uc->filename = (char *) &uc[1];
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/avio.h ('k') | source/patched-ffmpeg-mt/libavformat/aviobuf.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698