[FFmpeg-cvslog] avformat/ftp: allow nonstandard 202 reply to OPTS UTF8

2018-11-04 Thread Marton Balint 
ffmpeg | branch: release/4.1 | Marton Balint  | Thu Nov  1 
21:03:59 2018 +0100| [63c1e291ef7ba97ce0dc7c0bdd46b81f71a52b9d] | committer: 
Marton Balint

avformat/ftp: allow nonstandard 202 reply to OPTS UTF8

Fixes ticket #7481.

Signed-off-by: Marton Balint 
(cherry picked from commit 8e5a2495a8dad262e0a00fbca09b7779b4ebf0bf)

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

 libavformat/ftp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavformat/ftp.c b/libavformat/ftp.c
index 5063b7c204..e072067480 100644
--- a/libavformat/ftp.c
+++ b/libavformat/ftp.c
@@ -513,7 +513,7 @@ static int ftp_features(FTPContext *s)
 static const char *feat_command= "FEAT\r\n";
 static const char *enable_utf8_command = "OPTS UTF8 ON\r\n";
 static const int feat_codes[] = {211, 0};
-static const int opts_codes[] = {200, 451, 0};
+static const int opts_codes[] = {200, 202, 451, 0};
 
 av_freep(>features);
 if (ftp_send_command(s, feat_command, feat_codes, >features) != 211) {
@@ -521,7 +521,8 @@ static int ftp_features(FTPContext *s)
 }
 
 if (ftp_has_feature(s, "UTF8")) {
-if (ftp_send_command(s, enable_utf8_command, opts_codes, NULL) == 200)
+int ret = ftp_send_command(s, enable_utf8_command, opts_codes, NULL);
+if (ret == 200 || ret == 202)
 s->utf8 = 1;
 }
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avformat/ftp: allow nonstandard 202 reply to OPTS UTF8

2018-11-04 Thread Marton Balint 
ffmpeg | branch: master | Marton Balint  | Thu Nov  1 21:03:59 
2018 +0100| [8e5a2495a8dad262e0a00fbca09b7779b4ebf0bf] | committer: Marton 
Balint

avformat/ftp: allow nonstandard 202 reply to OPTS UTF8

Fixes ticket #7481.

Signed-off-by: Marton Balint 

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

 libavformat/ftp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavformat/ftp.c b/libavformat/ftp.c
index 5063b7c204..e072067480 100644
--- a/libavformat/ftp.c
+++ b/libavformat/ftp.c
@@ -513,7 +513,7 @@ static int ftp_features(FTPContext *s)
 static const char *feat_command= "FEAT\r\n";
 static const char *enable_utf8_command = "OPTS UTF8 ON\r\n";
 static const int feat_codes[] = {211, 0};
-static const int opts_codes[] = {200, 451, 0};
+static const int opts_codes[] = {200, 202, 451, 0};
 
 av_freep(>features);
 if (ftp_send_command(s, feat_command, feat_codes, >features) != 211) {
@@ -521,7 +521,8 @@ static int ftp_features(FTPContext *s)
 }
 
 if (ftp_has_feature(s, "UTF8")) {
-if (ftp_send_command(s, enable_utf8_command, opts_codes, NULL) == 200)
+int ret = ftp_send_command(s, enable_utf8_command, opts_codes, NULL);
+if (ret == 200 || ret == 202)
 s->utf8 = 1;
 }
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog