Commit 404eba44 authored by Aurelien Jacobs's avatar Aurelien Jacobs

add FF_API_URL_CLASS define to enable usage of URLContext as a AVClass

Originally committed as revision 24835 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent cd223e0b
...@@ -45,6 +45,9 @@ ...@@ -45,6 +45,9 @@
#ifndef FF_API_OLD_METADATA #ifndef FF_API_OLD_METADATA
#define FF_API_OLD_METADATA (LIBAVFORMAT_VERSION_MAJOR < 53) #define FF_API_OLD_METADATA (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif #endif
#ifndef FF_API_URL_CLASS
#define FF_API_URL_CLASS (LIBAVFORMAT_VERSION_MAJOR >= 53)
#endif
/** /**
* I return the LIBAVFORMAT_VERSION_INT constant. You got * I return the LIBAVFORMAT_VERSION_INT constant. You got
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "network.h" #include "network.h"
#endif #endif
#if LIBAVFORMAT_VERSION_MAJOR >= 53 #if FF_API_URL_CLASS
/** @name Logging context. */ /** @name Logging context. */
/*@{*/ /*@{*/
static const char *urlcontext_to_name(void *ptr) static const char *urlcontext_to_name(void *ptr)
...@@ -109,7 +109,7 @@ static int url_alloc_for_protocol (URLContext **puc, struct URLProtocol *up, ...@@ -109,7 +109,7 @@ static int url_alloc_for_protocol (URLContext **puc, struct URLProtocol *up,
err = AVERROR(ENOMEM); err = AVERROR(ENOMEM);
goto fail; goto fail;
} }
#if LIBAVFORMAT_VERSION_MAJOR >= 53 #if FF_API_URL_CLASS
uc->av_class = &urlcontext_class; uc->av_class = &urlcontext_class;
#endif #endif
uc->filename = (char *) &uc[1]; uc->filename = (char *) &uc[1];
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
* sizeof(URLContext) must not be used outside libav*. * sizeof(URLContext) must not be used outside libav*.
*/ */
typedef struct URLContext { 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(). const AVClass *av_class; ///< information for av_log(). Set by url_open().
#endif #endif
struct URLProtocol *prot; struct URLProtocol *prot;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment