> + // read headers if not already loaded (this is needed to check if > connection is closing) > + if (!s->end_header) { > + int new_location; > + http_read_header(h, &new_location); > + > + if (s->willclose) { > + ret = ffurl_closep(&s->hd); > + > + if (ret < 0) > + return ret; > + } > + } > +
Your indentation style doesn't correspond to ffmpeg's. > @@ -1637,6 +1647,7 @@ static int http_shutdown(URLContext *h, int flags) > s->hd->flags |= AVIO_FLAG_NONBLOCK; > read_ret = ffurl_read(s->hd, buf, sizeof(buf)); > s->hd->flags &= ~AVIO_FLAG_NONBLOCK; > + > if (read_ret < 0 && read_ret != AVERROR(EAGAIN)) { > av_log(h, AV_LOG_ERROR, "URL read error: %s\n", > av_err2str(read_ret)); > ret = read_ret; This change doesn't belong here. Furthermore, the explanation from your original e-mail can go into the commit message. Incl. the additional remark "Fixes #7975". The first line of the commit message needs to be prefixed with "avformat/http: ". Moritz _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".