[FFmpeg-devel] [PATCH 16/16] lavf: remove FF_API_URL_CLASS cruft.

[Anton Khirnov]

---
 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 7750513..c15d064 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -30,7 +30,6 @@
 #include "network.h"
 #endif
 
-#if FF_API_URL_CLASS
 /** @name Logging context. */
 /*@{*/
 static const char *urlcontext_to_name(void *ptr)
@@ -43,7 +42,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);
 
@@ -86,9 +84,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 7817ee0..6cb2855 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -45,9 +45,7 @@
  * sizeof(URLContext) must not be used outside libav*.
  */
 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 748aab3..3c7cd5c 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -37,12 +37,7 @@
 #include "rtmp.h"
 #include "rtmppkt.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 5115ace..9aea2c5 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -41,9 +41,6 @@
  * Those FF_API_* defines are not part of public API.
  * They may change, break or disappear at any time.
  */
-#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.2.3