---
libavformat/avio.c | 4 ----
libavformat/avio.h | 2 --
libavformat/rtmpproto.c | 5 -----
libavformat/version.h | 3 ---
4 files changed, 0 insertions(+), 14 deletions(-)
diff --git a/libavformat/avio.c b/libavformat/avio.c
index c1c2027..4f8acb0 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -31,7 +31,6 @@
#endif
#include "url.h"
-#if FF_API_URL_CLASS
/** @name Logging context. */
/*@{*/
static const char *urlcontext_to_name(void *ptr)
@@ -44,7 +43,6 @@ static const AVOption options[] = {{NULL}};
static const AVClass urlcontext_class =
{ "URLContext", urlcontext_to_name, options, LIBAVUTIL_VERSION_INT };
/*@}*/
-#endif
static int default_interrupt_cb(void);
@@ -99,9 +97,7 @@ static int url_alloc_for_protocol (URLContext **puc, struct
URLProtocol *up,
err = AVERROR(ENOMEM);
goto fail;
}
-#if FF_API_URL_CLASS
uc->av_class = &urlcontext_class;
-#endif
uc->filename = (char *) &uc[1];
strcpy(uc->filename, filename);
uc->prot = up;
diff --git a/libavformat/avio.h b/libavformat/avio.h
index 2502711..62ea42c 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -101,9 +101,7 @@ typedef struct {
* @deprecated This struct will be made private
*/
typedef struct URLContext {
-#if FF_API_URL_CLASS
const AVClass *av_class; ///< information for av_log(). Set by url_open().
-#endif
struct URLProtocol *prot;
int flags;
int is_streamed; /**< true if streamed (no seek possible), default =
false */
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 9fc5196..3a20356 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -38,12 +38,7 @@
#include "rtmppkt.h"
#include "url.h"
-/* we can't use av_log() with URLContext yet... */
-#if FF_API_URL_CLASS
#define LOG_CONTEXT s
-#else
-#define LOG_CONTEXT NULL
-#endif
//#define DEBUG
diff --git a/libavformat/version.h b/libavformat/version.h
index 735891a..6396164 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -44,9 +44,6 @@
#ifndef FF_API_OLD_METADATA2
#define FF_API_OLD_METADATA2 (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
-#ifndef FF_API_URL_CLASS
-#define FF_API_URL_CLASS (LIBAVFORMAT_VERSION_MAJOR >= 53)
-#endif
#ifndef FF_API_READ_SEEK
#define FF_API_READ_SEEK (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif
--
1.7.4.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
