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

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

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/avidec.c ('k') | source/patched-ffmpeg-mt/libavformat/avio.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.h
===================================================================
--- source/patched-ffmpeg-mt/libavformat/avio.h (revision 59334)
+++ source/patched-ffmpeg-mt/libavformat/avio.h (working copy)
@@ -43,7 +43,7 @@
* sizeof(URLContext) must not be used outside libav*.
*/
typedef struct URLContext {
-#if LIBAVFORMAT_VERSION_MAJOR >= 53
+#if FF_API_URL_CLASS
const AVClass *av_class; ///< information for av_log(). Set by url_open().
#endif
struct URLProtocol *prot;
@@ -256,7 +256,7 @@
const AVClass *priv_data_class;
} URLProtocol;
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if FF_API_REGISTER_PROTOCOL
extern URLProtocol *first_protocol;
#endif
@@ -269,7 +269,7 @@
*/
URLProtocol *av_protocol_next(URLProtocol *p);
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if FF_API_REGISTER_PROTOCOL
/**
* @deprecated Use av_register_protocol() instead.
*/
@@ -454,7 +454,7 @@
/** @warning must be called before any I/O */
int url_setbufsize(ByteIOContext *s, int buf_size);
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if FF_API_URL_RESETBUF
/** Reset the buffer for reading or writing.
* @note Will drop any data currently in the buffer without transmitting it.
* @param flags URL_RDONLY to set up the buffer for reading, or URL_WRONLY
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/avidec.c ('k') | source/patched-ffmpeg-mt/libavformat/avio.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698