[FFmpeg-devel] avformat/http: reconnect when connect reset by peer

[Michael Niedermayer]

On Fri, Mar 01, 2019 at 09:39:14AM +0000, lmzeng(曾令明) wrote:
> diff --git a/libavformat/http.c b/libavformat/http.c
> old mode 100644
> new mode 100755
> index ed0eb1c..400df94
> --- a/libavformat/http.c
> +++ b/libavformat/http.c
> @@ -253,6 +253,7 @@ static int http_open_cnx(URLContext *h, AVDictionary **options)
>      HTTPAuthType cur_auth_type, cur_proxy_auth_type;
>      HTTPContext *s = h->priv_data;
>      int location_changed, attempts = 0, redirects = 0;
> +    int retry = 0;
>  redo:
>      av_dict_copy(options, s->chained_options, 0);
> 
> @@ -260,9 +261,21 @@ redo:
>      cur_proxy_auth_type = s->auth_state.auth_type;

It seems git does not like this patch 

Applying: avformat/http: reconnect when connect reset by peer
error: corrupt patch at line 14
error: could not build fake ancestor
Patch failed at 0001 avformat/http: reconnect when connect reset by peer
hint: Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".


[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Frequently ignored answer#1 FFmpeg bugs should be sent to our bugtracker. User
questions about the command line tools should be sent to the ffmpeg-user ML.
And questions about how to use libav* should be sent to the libav-user ML.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20190302/81a9cafb/attachment.sig>