Mercurial > libavformat.hg
changeset 6392:daca8bebdd88 libavformat
add FF_API_URL_CLASS define to enable usage of URLContext as a AVClass
| author | aurel |
|---|---|
| date | Thu, 19 Aug 2010 16:49:08 +0000 |
| parents | d05e8fb04c6f |
| children | 98bbeb6188e5 |
| files | avformat.h avio.c avio.h |
| diffstat | 3 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/avformat.h Thu Aug 19 14:54:37 2010 +0000 +++ b/avformat.h Thu Aug 19 16:49:08 2010 +0000 @@ -45,6 +45,9 @@ #ifndef FF_API_OLD_METADATA #define FF_API_OLD_METADATA (LIBAVFORMAT_VERSION_MAJOR < 53) #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
--- a/avio.c Thu Aug 19 14:54:37 2010 +0000 +++ b/avio.c Thu Aug 19 16:49:08 2010 +0000 @@ -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) @@ -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];
--- a/avio.h Thu Aug 19 14:54:37 2010 +0000 +++ b/avio.h Thu Aug 19 16:49:08 2010 +0000 @@ -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;