| Message ID | 20190119070348.13601-1-lq@chinaffmpeg.org |
|---|---|
| State | Accepted |
| Commit | 9ec1f7634a621b0fda6d814f730c270c6e22b251 |
| Headers | show |
On 19-01-2019 12:33 PM, Steven Liu wrote: > when set option fmp4_init_filename to init_%v.mp4 > before patch: > the init file will be init_%v_0.mp4, init_%v_1.mp4 > after patch: > the init file will be init_0.mp4, init_1.mp4 > > Reported-By: Gyan Doshi <ffmpeg@gyani.pro> > Signed-off-by: Steven Liu <lq@chinaffmpeg.org> > --- > libavformat/hlsenc.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c > index ca57694e9e..d98d52a332 100644 > --- a/libavformat/hlsenc.c > +++ b/libavformat/hlsenc.c > @@ -2715,7 +2715,11 @@ static int hls_init(AVFormatContext *s) > av_strlcpy(vs->fmp4_init_filename, hls->fmp4_init_filename, > fmp4_init_filename_len); > if (hls->nb_varstreams > 1) { > - ret = append_postfix(vs->fmp4_init_filename, fmp4_init_filename_len, i); > + if (av_stristr(vs->fmp4_init_filename, "%v")) { > + format_name(vs->fmp4_init_filename, fmp4_init_filename_len, i); > + } else { > + ret = append_postfix(vs->fmp4_init_filename, fmp4_init_filename_len, i); > + } > if (ret < 0) > goto fail; > } Steven, ping. Gyan
> On Feb 10, 2019, at 12:45, Gyan <ffmpeg@gyani.pro> wrote: > > > > On 19-01-2019 12:33 PM, Steven Liu wrote: >> when set option fmp4_init_filename to init_%v.mp4 >> before patch: >> the init file will be init_%v_0.mp4, init_%v_1.mp4 >> after patch: >> the init file will be init_0.mp4, init_1.mp4 >> >> Reported-By: Gyan Doshi <ffmpeg@gyani.pro> >> Signed-off-by: Steven Liu <lq@chinaffmpeg.org> >> --- >> libavformat/hlsenc.c | 6 +++++- >> 1 file changed, 5 insertions(+), 1 deletion(-) >> >> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c >> index ca57694e9e..d98d52a332 100644 >> --- a/libavformat/hlsenc.c >> +++ b/libavformat/hlsenc.c >> @@ -2715,7 +2715,11 @@ static int hls_init(AVFormatContext *s) >> av_strlcpy(vs->fmp4_init_filename, hls->fmp4_init_filename, >> fmp4_init_filename_len); >> if (hls->nb_varstreams > 1) { >> - ret = append_postfix(vs->fmp4_init_filename, fmp4_init_filename_len, i); >> + if (av_stristr(vs->fmp4_init_filename, "%v")) { >> + format_name(vs->fmp4_init_filename, fmp4_init_filename_len, i); >> + } else { >> + ret = append_postfix(vs->fmp4_init_filename, fmp4_init_filename_len, i); >> + } >> if (ret < 0) >> goto fail; >> } > > Steven, ping. Pushed Sorry for the delay, these days are Chinese Spring Festival. > > Gyan > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel Thanks Steven
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index ca57694e9e..d98d52a332 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2715,7 +2715,11 @@ static int hls_init(AVFormatContext *s) av_strlcpy(vs->fmp4_init_filename, hls->fmp4_init_filename, fmp4_init_filename_len); if (hls->nb_varstreams > 1) { - ret = append_postfix(vs->fmp4_init_filename, fmp4_init_filename_len, i); + if (av_stristr(vs->fmp4_init_filename, "%v")) { + format_name(vs->fmp4_init_filename, fmp4_init_filename_len, i); + } else { + ret = append_postfix(vs->fmp4_init_filename, fmp4_init_filename_len, i); + } if (ret < 0) goto fail; }
when set option fmp4_init_filename to init_%v.mp4 before patch: the init file will be init_%v_0.mp4, init_%v_1.mp4 after patch: the init file will be init_0.mp4, init_1.mp4 Reported-By: Gyan Doshi <ffmpeg@gyani.pro> Signed-off-by: Steven Liu <lq@chinaffmpeg.org> --- libavformat/hlsenc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)