RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-07 17:52:54 +00:00
Code Issues Projects Releases Wiki Activity

avformat/dashenc : Handled error from ff_http_do_new_request() cleanly

Browse Source
This commit is contained in:
kjeyapal@akamai.com 2018-11-16 14:27:11 +05:30 committed by Karthick J
parent 3913d6f734
commit 4903662a1d
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/dashenc.c
View File

@ -174,6 +174,8 @@ static int dashenc_io_open(AVFormatContext *s, AVIOContext **pb, char *filename,
URLContext *http_url_context = ffio_geturlcontext(*pb); URLContext *http_url_context = ffio_geturlcontext(*pb);
av_assert0(http_url_context); av_assert0(http_url_context);
err = ff_http_do_new_request(http_url_context, filename); err = ff_http_do_new_request(http_url_context, filename);
if (err < 0)
ff_format_io_close(s, pb);
#endif #endif
} }
return err; return err;
@ -183,6 +185,9 @@ static void dashenc_io_close(AVFormatContext *s, AVIOContext **pb, char *filenam
DASHContext *c = s->priv_data; DASHContext *c = s->priv_data;
int http_base_proto = filename ? ff_is_http_proto(filename) : 0; int http_base_proto = filename ? ff_is_http_proto(filename) : 0;
if (!*pb)
return;
if (!http_base_proto || !c->http_persistent) { if (!http_base_proto || !c->http_persistent) {
ff_format_io_close(s, pb); ff_format_io_close(s, pb);
#if CONFIG_HTTP_PROTOCOL #if CONFIG_HTTP_PROTOCOL
@ -356,6 +361,7 @@ static int flush_dynbuf(OutputStream *os, int *range_length)
// write out to file // write out to file
*range_length = avio_close_dyn_buf(os->ctx->pb, &buffer); *range_length = avio_close_dyn_buf(os->ctx->pb, &buffer);
os->ctx->pb = NULL; os->ctx->pb = NULL;
if (os->out)
avio_write(os->out, buffer + os->written_len, *range_length - os->written_len); avio_write(os->out, buffer + os->written_len, *range_length - os->written_len);
os->written_len = 0; os->written_len = 0;
av_free(buffer); av_free(buffer);