diff options
author | Ronald S. Bultje | 2015-08-17 20:45:35 -0400 |
---|---|---|
committer | Ronald S. Bultje | 2015-08-18 10:24:01 -0400 |
commit | 229843aa359ae0c9519977d7fa952688db63f559 (patch) | |
tree | f931598935b67d8d9b2a64190876a9b829e1f287 /libavformat/ftp.c | |
parent | ad7d972e08dddb1788ac6a434d1be314febcb09d (diff) |
Replace av_dlog with ff_dlog.
ff_dlog checks compilability, and is non-public. av_dlog is deprecated
and no longer exists if FF_API_DLOG=0.
Diffstat (limited to 'libavformat/ftp.c')
-rw-r--r-- | libavformat/ftp.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/libavformat/ftp.c b/libavformat/ftp.c index f603379e5b..db233c9b4b 100644 --- a/libavformat/ftp.c +++ b/libavformat/ftp.c @@ -19,6 +19,7 @@ */ #include "libavutil/avstring.h" +#include "libavutil/internal.h" #include "libavutil/parseutils.h" #include "avformat.h" #include "internal.h" @@ -200,7 +201,7 @@ static int ftp_send_command(FTPContext *s, const char *command, { int err; - av_dlog(s, "%s", command); + ff_dlog(s, "%s", command); if (response) *response = NULL; @@ -283,7 +284,7 @@ static int ftp_passive_mode_epsv(FTPContext *s) end[-1] = '\0'; s->server_data_port = atoi(start); - av_dlog(s, "Server data port: %d\n", s->server_data_port); + ff_dlog(s, "Server data port: %d\n", s->server_data_port); av_free(res); return 0; @@ -329,7 +330,7 @@ static int ftp_passive_mode(FTPContext *s) start = av_strtok(end, ",", &end); if (!start) goto fail; s->server_data_port += atoi(start); - av_dlog(s, "Server data port: %d\n", s->server_data_port); + ff_dlog(s, "Server data port: %d\n", s->server_data_port); av_free(res); return 0; @@ -698,7 +699,7 @@ static int ftp_open(URLContext *h, const char *url, int flags) FTPContext *s = h->priv_data; int err; - av_dlog(h, "ftp protocol open\n"); + ff_dlog(h, "ftp protocol open\n"); if ((err = ftp_connect(h, url)) < 0) goto fail; @@ -726,7 +727,7 @@ static int64_t ftp_seek(URLContext *h, int64_t pos, int whence) int err; int64_t new_pos, fake_pos; - av_dlog(h, "ftp protocol seek %"PRId64" %d\n", pos, whence); + ff_dlog(h, "ftp protocol seek %"PRId64" %d\n", pos, whence); switch(whence) { case AVSEEK_SIZE: @@ -768,7 +769,7 @@ static int ftp_read(URLContext *h, unsigned char *buf, int size) FTPContext *s = h->priv_data; int read, err, retry_done = 0; - av_dlog(h, "ftp protocol read %d bytes\n", size); + ff_dlog(h, "ftp protocol read %d bytes\n", size); retry: if (s->state == DISCONNECTED) { /* optimization */ @@ -826,7 +827,7 @@ static int ftp_write(URLContext *h, const unsigned char *buf, int size) FTPContext *s = h->priv_data; int written; - av_dlog(h, "ftp protocol write %d bytes\n", size); + ff_dlog(h, "ftp protocol write %d bytes\n", size); if (s->state == DISCONNECTED) { if ((err = ftp_connect_data_connection(h)) < 0) @@ -853,7 +854,7 @@ static int ftp_close(URLContext *h) { FTPContext *s = h->priv_data; - av_dlog(h, "ftp protocol close\n"); + ff_dlog(h, "ftp protocol close\n"); ftp_close_both_connections(s); av_freep(&s->user); @@ -869,7 +870,7 @@ static int ftp_get_file_handle(URLContext *h) { FTPContext *s = h->priv_data; - av_dlog(h, "ftp protocol get_file_handle\n"); + ff_dlog(h, "ftp protocol get_file_handle\n"); if (s->conn_data) return ffurl_get_file_handle(s->conn_data); @@ -881,7 +882,7 @@ static int ftp_shutdown(URLContext *h, int flags) { FTPContext *s = h->priv_data; - av_dlog(h, "ftp protocol shutdown\n"); + ff_dlog(h, "ftp protocol shutdown\n"); if (s->conn_data) return ffurl_shutdown(s->conn_data, flags); @@ -933,7 +934,7 @@ static int ftp_parse_entry_nlst(char *line, AVIODirEntry *next) static int ftp_parse_entry_mlsd(char *mlsd, AVIODirEntry *next) { char *fact, *value; - av_dlog(NULL, "%s\n", mlsd); + ff_dlog(NULL, "%s\n", mlsd); while(fact = av_strtok(mlsd, ";", &mlsd)) { if (fact[0] == ' ') { next->name = av_strdup(&fact[1]); |