Commit 7f804085 authored by Anton Khirnov's avatar Anton Khirnov

lavf: remove FF_API_URL_CLASS cruft.

parent 5763e639
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#endif #endif
#include "url.h" #include "url.h"
#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)
...@@ -44,7 +43,6 @@ static const AVOption options[] = {{NULL}}; ...@@ -44,7 +43,6 @@ static const AVOption options[] = {{NULL}};
static const AVClass urlcontext_class = static const AVClass urlcontext_class =
{ "URLContext", urlcontext_to_name, options, LIBAVUTIL_VERSION_INT }; { "URLContext", urlcontext_to_name, options, LIBAVUTIL_VERSION_INT };
/*@}*/ /*@}*/
#endif
static int default_interrupt_cb(void); static int default_interrupt_cb(void);
...@@ -99,9 +97,7 @@ static int url_alloc_for_protocol (URLContext **puc, struct URLProtocol *up, ...@@ -99,9 +97,7 @@ static int url_alloc_for_protocol (URLContext **puc, struct URLProtocol *up,
err = AVERROR(ENOMEM); err = AVERROR(ENOMEM);
goto fail; goto fail;
} }
#if FF_API_URL_CLASS
uc->av_class = &urlcontext_class; uc->av_class = &urlcontext_class;
#endif
uc->filename = (char *) &uc[1]; uc->filename = (char *) &uc[1];
strcpy(uc->filename, filename); strcpy(uc->filename, filename);
uc->prot = up; uc->prot = up;
......
...@@ -101,9 +101,7 @@ typedef struct { ...@@ -101,9 +101,7 @@ typedef struct {
* @deprecated This struct will be made private * @deprecated This struct will be made private
*/ */
typedef struct URLContext { typedef struct URLContext {
#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
struct URLProtocol *prot; struct URLProtocol *prot;
int flags; int flags;
int is_streamed; /**< true if streamed (no seek possible), default = false */ int is_streamed; /**< true if streamed (no seek possible), default = false */
......
This diff is collapsed.
...@@ -44,9 +44,6 @@ ...@@ -44,9 +44,6 @@
#ifndef FF_API_OLD_METADATA2 #ifndef FF_API_OLD_METADATA2
#define FF_API_OLD_METADATA2 (LIBAVFORMAT_VERSION_MAJOR < 54) #define FF_API_OLD_METADATA2 (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif #endif
#ifndef FF_API_URL_CLASS
#define FF_API_URL_CLASS (LIBAVFORMAT_VERSION_MAJOR >= 53)
#endif
#ifndef FF_API_READ_SEEK #ifndef FF_API_READ_SEEK
#define FF_API_READ_SEEK (LIBAVFORMAT_VERSION_MAJOR < 54) #define FF_API_READ_SEEK (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif #endif
......
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