xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-30 23:10:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avformat/hlsenc: use proper error codes

Browse Source 
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
This commit is contained in:
Limin Wang 2020-06-22 21:58:47 +08:00
parent 64059f5063
commit db92efd83e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/hlsenc.c
View File

@ -370,6 +370,7 @@ static int replace_str_data_in_filename(char **s, const char *filename, char pla
int addchar_count; int addchar_count;
int found_count = 0; int found_count = 0;
AVBPrint buf; AVBPrint buf;
int ret;
av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED);
@ -395,10 +396,10 @@ static int replace_str_data_in_filename(char **s, const char *filename, char pla
} }
if (!av_bprint_is_complete(&buf)) { if (!av_bprint_is_complete(&buf)) {
av_bprint_finalize(&buf, NULL); av_bprint_finalize(&buf, NULL);
return -1; return AVERROR(ENOMEM);
} }
if (av_bprint_finalize(&buf, &new_filename) < 0 || !new_filename) if ((ret = av_bprint_finalize(&buf, &new_filename)) < 0 || !new_filename)
return -1; return ret;
*s = new_filename; *s = new_filename;
return found_count; return found_count;
} }
@ -411,6 +412,7 @@ static int replace_int_data_in_filename(char **s, const char *filename, char pla
int nd, addchar_count; int nd, addchar_count;
int found_count = 0; int found_count = 0;
AVBPrint buf; AVBPrint buf;
int ret;
av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED);
@ -444,10 +446,10 @@ static int replace_int_data_in_filename(char **s, const char *filename, char pla
} }
if (!av_bprint_is_complete(&buf)) { if (!av_bprint_is_complete(&buf)) {
av_bprint_finalize(&buf, NULL); av_bprint_finalize(&buf, NULL);
return -1; return AVERROR(ENOMEM);
} }
if (av_bprint_finalize(&buf, &new_filename) < 0 || !new_filename) if ((ret = av_bprint_finalize(&buf, &new_filename)) < 0 || !new_filename)
return -1; return ret;
*s = new_filename; *s = new_filename;
return found_count; return found_count;
} }