summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorLukasz Marek <lukasz.m.luki@gmail.com>2013-10-12 13:50:22 +0200
committerLukasz Marek <lukasz.m.luki@gmail.com>2013-10-12 13:52:33 +0200
commit3a92ee59531611e1daa8f25b7b673c920781290f (patch)
treee9b7e20debae2cee41a3ad873c27c2d17a8be91f /libavformat
parente1fb3143bb3a6006612fe0e1d1a15c8eb4955802 (diff)
avformat/ftp: add log regarding passive mode failure
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/ftp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/ftp.c b/libavformat/ftp.c
index aaa94105e5..ed9a3db419 100644
--- a/libavformat/ftp.c
+++ b/libavformat/ftp.c
@@ -270,6 +270,8 @@ static int ftp_passive_mode(FTPContext *s)
fail:
av_free(res);
s->server_data_port = -1;
+ av_log(s, AV_LOG_ERROR, "Set passive mode failed\n"
+ "Your FTP server may use IPv6 which is not supported yet.\n");
return AVERROR(EIO);
}
@@ -421,7 +423,7 @@ static int ftp_connect_control_connection(URLContext *h)
}
if ((err = ftp_type(s)) < 0) {
- av_dlog(h, "Set content type failed\n");
+ av_log(h, AV_LOG_ERROR, "Set content type failed\n");
return err;
}
}
@@ -437,10 +439,8 @@ static int ftp_connect_data_connection(URLContext *h)
if (!s->conn_data) {
/* Enter passive mode */
- if ((err = ftp_passive_mode(s)) < 0) {
- av_dlog(h, "Set passive mode failed\n");
+ if ((err = ftp_passive_mode(s)) < 0)
return err;
- }
/* Open data connection */
ff_url_join(buf, sizeof(buf), "tcp", NULL, s->hostname, s->server_data_port, NULL);
if (s->rw_timeout != -1) {