| @@ -79,18 +79,6 @@ void ff_read_frame_flush(AVFormatContext *s); | |||||
| /** Get the current time since NTP epoch in microseconds. */ | /** Get the current time since NTP epoch in microseconds. */ | ||||
| uint64_t ff_ntp_time(void); | 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 | * Assemble a URL string from components. This is the reverse operation | ||||
| * of av_url_split. | * of av_url_split. | ||||
| @@ -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); | 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, | void av_url_split(char *proto, int proto_size, | ||||
| char *authorization, int authorization_size, | char *authorization, int authorization_size, | ||||
| char *hostname, int hostname_size, | char *hostname, int hostname_size, | ||||
| @@ -47,9 +47,6 @@ | |||||
| #ifndef FF_API_URL_CLASS | #ifndef FF_API_URL_CLASS | ||||
| #define FF_API_URL_CLASS (LIBAVFORMAT_VERSION_MAJOR >= 53) | #define FF_API_URL_CLASS (LIBAVFORMAT_VERSION_MAJOR >= 53) | ||||
| #endif | #endif | ||||
| #ifndef FF_API_URL_SPLIT | |||||
| #define FF_API_URL_SPLIT (LIBAVFORMAT_VERSION_MAJOR < 53) | |||||
| #endif | |||||
| #ifndef FF_API_ALLOC_FORMAT_CONTEXT | #ifndef FF_API_ALLOC_FORMAT_CONTEXT | ||||
| #define FF_API_ALLOC_FORMAT_CONTEXT (LIBAVFORMAT_VERSION_MAJOR < 53) | #define FF_API_ALLOC_FORMAT_CONTEXT (LIBAVFORMAT_VERSION_MAJOR < 53) | ||||
| #endif | #endif | ||||