[FFmpeg-cvslog] lavf: remove FF_API_URL_SPLIT cruft

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Feb  3 12:40:25 2011 +0100| [5048e36c994663f7f4977efc48c3eec601654e5a] | committer: Anton Khirnov

lavf: remove FF_API_URL_SPLIT cruft

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5048e36c994663f7f4977efc48c3eec601654e5a
---

 libavformat/internal.h |   12 ------------
 libavformat/utils.c    |   18 ------------------
 libavformat/version.h  |    3 ---
 3 files changed, 0 insertions(+), 33 deletions(-)

diff --git a/libavformat/internal.h b/libavformat/internal.h
index 9bc2340..6f1305c 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -79,18 +79,6 @@ void ff_read_frame_flush(AVFormatContext *s);
 /** Get the current time since NTP epoch in microseconds. */
 uint64_t ff_ntp_time(void);
 
-#if FF_API_URL_SPLIT
-/**
- * @deprecated use av_url_split() instead
- */
-void ff_url_split(char *proto, int proto_size,
-                  char *authorization, int authorization_size,
-                  char *hostname, int hostname_size,
-                  int *port_ptr,
-                  char *path, int path_size,
-                  const char *url);
-#endif
-
 /**
  * Assemble a URL string from components. This is the reverse operation
  * of av_url_split.
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 80700d4..91e0ddc 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3517,24 +3517,6 @@ void av_pkt_dump_log2(void *avcl, int level, AVPacket *pkt, int dump_payload,
     pkt_dump_internal(avcl, NULL, level, pkt, dump_payload, st->time_base);
 }
 
-#if FF_API_URL_SPLIT
-attribute_deprecated
-void ff_url_split(char *proto, int proto_size,
-                  char *authorization, int authorization_size,
-                  char *hostname, int hostname_size,
-                  int *port_ptr,
-                  char *path, int path_size,
-                  const char *url)
-{
-    av_url_split(proto, proto_size,
-                 authorization, authorization_size,
-                 hostname, hostname_size,
-                 port_ptr,
-                 path, path_size,
-                 url);
-}
-#endif
-
 void av_url_split(char *proto, int proto_size,
                   char *authorization, int authorization_size,
                   char *hostname, int hostname_size,
diff --git a/libavformat/version.h b/libavformat/version.h
index 5042149..9b8192d 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -47,9 +47,6 @@
 #ifndef FF_API_URL_CLASS
 #define FF_API_URL_CLASS               (LIBAVFORMAT_VERSION_MAJOR >= 53)
 #endif
-#ifndef FF_API_URL_SPLIT
-#define FF_API_URL_SPLIT               (LIBAVFORMAT_VERSION_MAJOR < 53)
-#endif
 #ifndef FF_API_ALLOC_FORMAT_CONTEXT
 #define FF_API_ALLOC_FORMAT_CONTEXT    (LIBAVFORMAT_VERSION_MAJOR < 53)
 #endif