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

Unified Diff: source/patched-ffmpeg-mt/libavformat/aviobuf.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.c ('k') | source/patched-ffmpeg-mt/libavformat/cavsvideodec.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/patched-ffmpeg-mt/libavformat/aviobuf.c
===================================================================
--- source/patched-ffmpeg-mt/libavformat/aviobuf.c (revision 59334)
+++ source/patched-ffmpeg-mt/libavformat/aviobuf.c (working copy)
@@ -36,7 +36,7 @@
#define SHORT_SEEK_THRESHOLD 4096
static void fill_buffer(ByteIOContext *s);
-#if LIBAVFORMAT_VERSION_MAJOR >= 53
+#if !FF_API_URL_RESETBUF
static int url_resetbuf(ByteIOContext *s, int flags);
#endif
@@ -632,13 +632,13 @@
return 0;
}
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if FF_API_URL_RESETBUF
int url_resetbuf(ByteIOContext *s, int flags)
#else
static int url_resetbuf(ByteIOContext *s, int flags)
#endif
{
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if FF_API_URL_RESETBUF
if (flags & URL_RDWR)
return AVERROR(EINVAL);
#else
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/avio.c ('k') | source/patched-ffmpeg-mt/libavformat/cavsvideodec.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698