diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-03 12:40:25 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-19 18:28:38 +0200 |
| commit | 5048e36c994663f7f4977efc48c3eec601654e5a (patch) | |
| tree | d8344342dcc4e0433cfb5525e4a7b578fc73cdd4 | |
| parent | c4efa7c22960588ff5163a1cfe026b48b8f6ec41 (diff) | |
lavf: remove FF_API_URL_SPLIT cruft
| -rw-r--r-- | libavformat/internal.h | 12 | ||||
| -rw-r--r-- | libavformat/utils.c | 18 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
3 files changed, 0 insertions, 33 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index 9bc23402a4..6f1305ce25 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 80700d4b2b..91e0ddca2d 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 50421495bb..9b8192d96d 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 |