| Message ID | 20191226105342.11175-7-andreas.rheinhardt@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
Andreas Rheinhardt: > It doesn't do anything: All allocated blocks have already been freed in > write_header. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> > --- > libavformat/webmdashenc.c | 7 ------- > 1 file changed, 7 deletions(-) > > diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c > index 26b8727304..d2f0e0ec4d 100644 > --- a/libavformat/webmdashenc.c > +++ b/libavformat/webmdashenc.c > @@ -550,12 +550,6 @@ static int webm_dash_manifest_write_packet(AVFormatContext *s, AVPacket *pkt) > return AVERROR_EOF; > } > > -static int webm_dash_manifest_write_trailer(AVFormatContext *s) > -{ > - free_adaptation_sets(s); > - return 0; > -} > - > #define OFFSET(x) offsetof(WebMDashMuxContext, x) > static const AVOption options[] = { > { "adaptation_sets", "Adaptation sets. Syntax: id=0,streams=0,1,2 id=1,streams=3,4 and so on", OFFSET(adaptation_sets), AV_OPT_TYPE_STRING, { 0 }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM }, > @@ -585,7 +579,6 @@ AVOutputFormat ff_webm_dash_manifest_muxer = { > .priv_data_size = sizeof(WebMDashMuxContext), > .write_header = webm_dash_manifest_write_header, > .write_packet = webm_dash_manifest_write_packet, > - .write_trailer = webm_dash_manifest_write_trailer, > .priv_class = &webm_dash_class, > }; > #endif > Ping. - Andreas
lgtm On 12/26/19, Andreas Rheinhardt <andreas.rheinhardt@gmail.com> wrote: > It doesn't do anything: All allocated blocks have already been freed in > write_header. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> > --- > libavformat/webmdashenc.c | 7 ------- > 1 file changed, 7 deletions(-) > > diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c > index 26b8727304..d2f0e0ec4d 100644 > --- a/libavformat/webmdashenc.c > +++ b/libavformat/webmdashenc.c > @@ -550,12 +550,6 @@ static int > webm_dash_manifest_write_packet(AVFormatContext *s, AVPacket *pkt) > return AVERROR_EOF; > } > > -static int webm_dash_manifest_write_trailer(AVFormatContext *s) > -{ > - free_adaptation_sets(s); > - return 0; > -} > - > #define OFFSET(x) offsetof(WebMDashMuxContext, x) > static const AVOption options[] = { > { "adaptation_sets", "Adaptation sets. Syntax: id=0,streams=0,1,2 > id=1,streams=3,4 and so on", OFFSET(adaptation_sets), AV_OPT_TYPE_STRING, { > 0 }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM }, > @@ -585,7 +579,6 @@ AVOutputFormat ff_webm_dash_manifest_muxer = { > .priv_data_size = sizeof(WebMDashMuxContext), > .write_header = webm_dash_manifest_write_header, > .write_packet = webm_dash_manifest_write_packet, > - .write_trailer = webm_dash_manifest_write_trailer, > .priv_class = &webm_dash_class, > }; > #endif > -- > 2.20.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
On 3/15/2020 8:53 AM, Paul B Mahol wrote: > lgtm Applied. > > On 12/26/19, Andreas Rheinhardt <andreas.rheinhardt@gmail.com> wrote: >> It doesn't do anything: All allocated blocks have already been freed in >> write_header. >> >> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> >> --- >> libavformat/webmdashenc.c | 7 ------- >> 1 file changed, 7 deletions(-) >> >> diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c >> index 26b8727304..d2f0e0ec4d 100644 >> --- a/libavformat/webmdashenc.c >> +++ b/libavformat/webmdashenc.c >> @@ -550,12 +550,6 @@ static int >> webm_dash_manifest_write_packet(AVFormatContext *s, AVPacket *pkt) >> return AVERROR_EOF; >> } >> >> -static int webm_dash_manifest_write_trailer(AVFormatContext *s) >> -{ >> - free_adaptation_sets(s); >> - return 0; >> -} >> - >> #define OFFSET(x) offsetof(WebMDashMuxContext, x) >> static const AVOption options[] = { >> { "adaptation_sets", "Adaptation sets. Syntax: id=0,streams=0,1,2 >> id=1,streams=3,4 and so on", OFFSET(adaptation_sets), AV_OPT_TYPE_STRING, { >> 0 }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM }, >> @@ -585,7 +579,6 @@ AVOutputFormat ff_webm_dash_manifest_muxer = { >> .priv_data_size = sizeof(WebMDashMuxContext), >> .write_header = webm_dash_manifest_write_header, >> .write_packet = webm_dash_manifest_write_packet, >> - .write_trailer = webm_dash_manifest_write_trailer, >> .priv_class = &webm_dash_class, >> }; >> #endif >> -- >> 2.20.1 >> >> _______________________________________________ >> ffmpeg-devel mailing list >> ffmpeg-devel@ffmpeg.org >> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel >> >> To unsubscribe, visit link above, or email >> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". >
diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c index 26b8727304..d2f0e0ec4d 100644 --- a/libavformat/webmdashenc.c +++ b/libavformat/webmdashenc.c @@ -550,12 +550,6 @@ static int webm_dash_manifest_write_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR_EOF; } -static int webm_dash_manifest_write_trailer(AVFormatContext *s) -{ - free_adaptation_sets(s); - return 0; -} - #define OFFSET(x) offsetof(WebMDashMuxContext, x) static const AVOption options[] = { { "adaptation_sets", "Adaptation sets. Syntax: id=0,streams=0,1,2 id=1,streams=3,4 and so on", OFFSET(adaptation_sets), AV_OPT_TYPE_STRING, { 0 }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM }, @@ -585,7 +579,6 @@ AVOutputFormat ff_webm_dash_manifest_muxer = { .priv_data_size = sizeof(WebMDashMuxContext), .write_header = webm_dash_manifest_write_header, .write_packet = webm_dash_manifest_write_packet, - .write_trailer = webm_dash_manifest_write_trailer, .priv_class = &webm_dash_class, }; #endif
It doesn't do anything: All allocated blocks have already been freed in write_header. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> --- libavformat/webmdashenc.c | 7 ------- 1 file changed, 7 deletions(-)