[FFmpeg-devel] [PATCH 2/2] avformat/ftp: allow nonstandard 202 reply to OPTS UTF8

Marton Balint cus at passwd.hu
Thu Nov 1 22:06:41 EET 2018


Fixes ticket #7481.

Signed-off-by: Marton Balint <cus at passwd.hu>
---
 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(&s->features);
     if (ftp_send_command(s, feat_command, feat_codes, &s->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;
     }
 
-- 
2.16.4



More information about the ffmpeg-devel mailing list