summaryrefslogtreecommitdiff
path: root/libavformat/hlsenc.c
diff options
context:
space:
mode:
authorLimin Wang <lance.lmwang@gmail.com>2020-06-25 00:14:55 +0800
committerLimin Wang <lance.lmwang@gmail.com>2020-07-02 21:12:37 +0800
commit0e10f54585e40a03ea8f19deed50dbf61c8055bc (patch)
tree8815dee8fb9bddb33eb3dbd8066a8109ca5912f4 /libavformat/hlsenc.c
parentfdda832603c7f027b3d0541289182ad221c1439c (diff)
avformat/hlsenc: simplify code to pass s directly
Suggested-by: Nicolas George <george@nsup.org> Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
Diffstat (limited to 'libavformat/hlsenc.c')
-rw-r--r--libavformat/hlsenc.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index a34da2f515..0a318d29ff 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -365,7 +365,6 @@ fail:
static int replace_str_data_in_filename(char **s, const char *filename, char placeholder, const char *datastring)
{
const char *p;
- char *new_filename;
char c;
int addchar_count;
int found_count = 0;
@@ -398,16 +397,14 @@ static int replace_str_data_in_filename(char **s, const char *filename, char pla
av_bprint_finalize(&buf, NULL);
return AVERROR(ENOMEM);
}
- if ((ret = av_bprint_finalize(&buf, &new_filename)) < 0)
+ if ((ret = av_bprint_finalize(&buf, s)) < 0)
return ret;
- *s = new_filename;
return found_count;
}
static int replace_int_data_in_filename(char **s, const char *filename, char placeholder, int64_t number)
{
const char *p;
- char *new_filename;
char c;
int nd, addchar_count;
int found_count = 0;
@@ -448,9 +445,8 @@ static int replace_int_data_in_filename(char **s, const char *filename, char pla
av_bprint_finalize(&buf, NULL);
return AVERROR(ENOMEM);
}
- if ((ret = av_bprint_finalize(&buf, &new_filename)) < 0)
+ if ((ret = av_bprint_finalize(&buf, s)) < 0)
return ret;
- *s = new_filename;
return found_count;
}