har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/hlsenc: remove duplicate operation at hls_write_header

Browse Source 
the options have set when avformat_init_output at hls_mux_init

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
This commit is contained in:
Steven Liu 2018-12-12 15:37:01 +08:00
parent 7d5bb3a4d3
commit cdbf8847ea
1 changed files with 4 additions and 10 deletions

14
libavformat/hlsenc.c

@ -787,7 +787,7 @@ static int hls_mux_init(AVFormatContext *s, VariantStream *vs)
av_dict_copy(&options, hls->format_options, 0); av_dict_copy(&options, hls->format_options, 0);
av_dict_set(&options, "fflags", "-autobsf", 0); av_dict_set(&options, "fflags", "-autobsf", 0);
av_dict_set(&options, "movflags", "frag_custom+dash+delay_moov", 0); av_dict_set(&options, "movflags", "+frag_custom+dash+delay_moov", AV_DICT_APPEND);
ret = avformat_init_output(oc, &options); ret = avformat_init_output(oc, &options);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -2079,15 +2079,9 @@ static int hls_write_header(AVFormatContext *s)
for (i = 0; i < hls->nb_varstreams; i++) { for (i = 0; i < hls->nb_varstreams; i++) {
vs = &hls->var_streams[i]; vs = &hls->var_streams[i];
av_dict_copy(&options, hls->format_options, 0); ret = avformat_write_header(vs->avf, NULL);
ret = avformat_write_header(vs->avf, &options); if (ret < 0)
if (av_dict_count(options)) { return ret;
av_log(s, AV_LOG_ERROR, "Some of provided format options in '%s' are not recognized\n", hls->format_options_str);
ret = AVERROR(EINVAL);
av_dict_free(&options);
goto fail;
}
av_dict_free(&options);
//av_assert0(s->nb_streams == hls->avf->nb_streams); //av_assert0(s->nb_streams == hls->avf->nb_streams);
for (j = 0; j < vs->nb_streams; j++) { for (j = 0; j < vs->nb_streams; j++) {
AVStream *inner_st; AVStream *inner_st;