Merge commit '25c7db7cc99d74fe6fb56a6fd52c9b5f1591e448'

[ffmpeg] / libavformat / http.c

diff --git a/libavformat/http.c b/libavformat/http.c
index 3d477366aecbb3a7885f5ce858ea3ca3cf2b0752..c5b5c53814fcb1003176cf5d4559d0c9d0606427 100644 (file)
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -437,7 +437,6 @@ static int process_line(URLContext *h, char *line, int line_count,
                 // the header at all if this is the case).
             } else {
                 av_log(h, AV_LOG_WARNING, "Unknown content coding: %s\n", p);
-                return AVERROR(ENOSYS);
             }
         }
     }
@@ -609,7 +608,8 @@ static int http_connect(URLContext *h, const char *path, const char *local_path,
          * send Expect: 100-continue to get the 401 response including the
          * WWW-Authenticate header, or an 100 continue if no auth actually
          * is needed. */
-        if (*auth && s->auth_state.auth_type == HTTP_AUTH_NONE &&
+        if (auth && *auth &&
+            s->auth_state.auth_type == HTTP_AUTH_NONE &&
             s->http_code != 401)
             send_expect_100 = 1;
     }