October 2019 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/tiff: Set FF_CODEC_CAP_INIT_CLEANUP
by Michael Niedermayer 03 Oct '19

03 Oct '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Oct 2 21:14:17 2019 +0200| [379e5d29d50ef957a65cfd536bc8c0713755fb77] | committer: Michael Niedermayer avcodec/tiff: Set FF_CODEC_CAP_INIT_CLEANUP Fixes: memleaks Fixes: 17813/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5145600206569472 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=379e5d29d50ef957a… --- libavcodec/tiff.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 9f24796a88..f537e99b5a 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -2090,8 +2090,6 @@ static av_cold int tiff_init(AVCodecContext *avctx) s->avctx_mjpeg->idct_algo = avctx->idct_algo; ret = ff_codec_open2_recursive(s->avctx_mjpeg, codec, NULL); if (ret < 0) { - av_frame_free(&s->jpgframe); - avcodec_free_context(&s->avctx_mjpeg); return ret; } @@ -2142,5 +2140,6 @@ AVCodec ff_tiff_decoder = { .decode = decode_frame, .init_thread_copy = ONLY_IF_THREADS_ENABLED(tiff_init), .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .priv_class = &tiff_decoder_class, };

1 0

avcodec/vc1_block: Fix invalid left shift in vc1_decode_p_mb()
by Michael Niedermayer 03 Oct '19

03 Oct '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Oct 2 19:53:44 2019 +0200| [2f588ccfb70cba54a7ea8e740110953da604c0e6] | committer: Michael Niedermayer avcodec/vc1_block: Fix invalid left shift in vc1_decode_p_mb() Fixes: left shift of negative value -6 Fixes: 17810/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VC1_fuzzer-5638541240958976 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2f588ccfb70cba54a… --- libavcodec/vc1_block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index fe7dbf8b1d..f1c9f41f30 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -1481,7 +1481,7 @@ static int vc1_decode_p_mb(VC1Context *v) v->vc1dsp.vc1_inv_trans_8x8(v->block[v->cur_blk_idx][block_map[i]]); if (v->rangeredfrm) for (j = 0; j < 64; j++) - v->block[v->cur_blk_idx][block_map[i]][j] <<= 1; + v->block[v->cur_blk_idx][block_map[i]][j] *= 2; block_cbp |= 0xF << (i << 2); block_intra |= 1 << i; } else if (is_coded[i]) {

1 0

avcodec/wmaprodec: Check if there is a stream
by Michael Niedermayer 03 Oct '19

03 Oct '19

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Oct 2 19:26:51 2019 +0200| [9b533de28eb19c660c75823ff2af2f8549c4095a] | committer: Michael Niedermayer avcodec/wmaprodec: Check if there is a stream Fixes: null pointer dereference Fixes: signed integer overflow: 512 * 2147483647 cannot be represented in type 'int' Fixes: 17809/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_XMA1_fuzzer-5634409947987968 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9b533de28eb19c660… --- libavcodec/wmaprodec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index d0fa974c80..6ce2dd4adb 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -1902,7 +1902,9 @@ static av_cold int xma_decode_init(AVCodecContext *avctx) } /* encoder supports up to 64 streams / 64*2 channels (would have to alloc arrays) */ - if (avctx->channels > XMA_MAX_CHANNELS || s->num_streams > XMA_MAX_STREAMS) { + if (avctx->channels > XMA_MAX_CHANNELS || s->num_streams > XMA_MAX_STREAMS || + s->num_streams <= 0 + ) { avpriv_request_sample(avctx, "More than %d channels in %d streams", XMA_MAX_CHANNELS, s->num_streams); return AVERROR_PATCHWELCOME; }

1 0

avformat/aiffenc: Remove wrong and redundant check
by Andreas Rheinhardt 03 Oct '19

03 Oct '19

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Wed Oct 2 06:04:12 2019 +0200| [be0d3a2df1a1ec627ba50f535f61f7fcd359f6a4] | committer: Michael Niedermayer avformat/aiffenc: Remove wrong and redundant check The check "if (!pb->seekable & AVIO_SEEKABLE_NORMAL)" is wrong, because ! has higher precendence than &. But it is also redundant, because this part of the code is only ever reached when the AVIO_SEEKABLE_NORMAL flag is set for pb. So simply remove the check. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> Reviewed-by: Matthieu Bouron <matthieu.bouron(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be0d3a2df1a1ec627… --- libavformat/aiffenc.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c index 0b837cd264..d09c9afb95 100644 --- a/libavformat/aiffenc.c +++ b/libavformat/aiffenc.c @@ -49,9 +49,6 @@ static int put_id3v2_tags(AVFormatContext *s, AIFFOutputContext *aiff) AVIOContext *pb = s->pb; AVPacketList *pict_list = aiff->pict_list; - if (!pb->seekable & AVIO_SEEKABLE_NORMAL) - return 0; - if (!s->metadata && !aiff->pict_list) return 0;

1 0

avformat/aiffenc: Fix potential memleak upon failure
by Andreas Rheinhardt 03 Oct '19

03 Oct '19

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Wed Oct 2 06:04:11 2019 +0200| [c694fc5759719de577fd0751103e20b6ce902a8f] | committer: Michael Niedermayer avformat/aiffenc: Fix potential memleak upon failure Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> Reviewed-by: Matthieu Bouron <matthieu.bouron(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c694fc5759719de57… --- libavformat/aiffenc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c index dd8b8c3d01..0b837cd264 100644 --- a/libavformat/aiffenc.c +++ b/libavformat/aiffenc.c @@ -235,7 +235,7 @@ static int aiff_write_packet(AVFormatContext *s, AVPacket *pkt) static int aiff_write_trailer(AVFormatContext *s) { - int ret; + int ret = 0; AVIOContext *pb = s->pb; AIFFOutputContext *aiff = s->priv_data; AVCodecParameters *par = s->streams[aiff->audio_stream_idx]->codecpar; @@ -263,7 +263,7 @@ static int aiff_write_trailer(AVFormatContext *s) /* Write ID3 tags */ if (aiff->write_id3v2) if ((ret = put_id3v2_tags(s, aiff)) < 0) - return ret; + goto free; /* File length */ file_size = avio_tell(pb); @@ -273,9 +273,10 @@ static int aiff_write_trailer(AVFormatContext *s) avio_flush(pb); } +free: ff_packet_list_free(&aiff->pict_list, &aiff->pict_list_end); - return 0; + return ret; } #define OFFSET(x) offsetof(AIFFOutputContext, x)

1 0

avformat/aiffenc: Use standard packet list functions
by Andreas Rheinhardt 03 Oct '19

03 Oct '19

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Wed Oct 2 06:04:10 2019 +0200| [c548b0a4c67b99e8728578a68084664d8bd220ac] | committer: Michael Niedermayer avformat/aiffenc: Use standard packet list functions Up until now, aiffenc didn't rely on the standard functions for adding an element to a linked list and freeing the list, but instead reimplemented them. This has been changed. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> Reviewed-by: Matthieu Bouron <matthieu.bouron(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c548b0a4c67b99e87… --- libavformat/aiffenc.c | 33 ++++----------------------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c index aab37418f0..dd8b8c3d01 100644 --- a/libavformat/aiffenc.c +++ b/libavformat/aiffenc.c @@ -36,7 +36,7 @@ typedef struct AIFFOutputContext { int64_t frames; int64_t ssnd; int audio_stream_idx; - AVPacketList *pict_list; + AVPacketList *pict_list, *pict_list_end; int write_id3v2; int id3v2_version; } AIFFOutputContext; @@ -215,9 +215,6 @@ static int aiff_write_packet(AVFormatContext *s, AVPacket *pkt) if (pkt->stream_index == aiff->audio_stream_idx) avio_write(pb, pkt->data, pkt->size); else { - int ret; - AVPacketList *pict_list, *last; - if (s->streams[pkt->stream_index]->codecpar->codec_type != AVMEDIA_TYPE_VIDEO) return 0; @@ -229,24 +226,8 @@ static int aiff_write_packet(AVFormatContext *s, AVPacket *pkt) if (s->streams[pkt->stream_index]->nb_frames >= 1) return 0; - pict_list = av_mallocz(sizeof(AVPacketList)); - if (!pict_list) - return AVERROR(ENOMEM); - - ret = av_packet_ref(&pict_list->pkt, pkt); - if (ret < 0) { - av_freep(&pict_list); - return ret; - } - - if (!aiff->pict_list) - aiff->pict_list = pict_list; - else { - last = aiff->pict_list; - while (last->next) - last = last->next; - last->next = pict_list; - } + return ff_packet_list_put(&aiff->pict_list, &aiff->pict_list_end, + pkt, FF_PACKETLIST_FLAG_REF_PACKET); } return 0; @@ -257,7 +238,6 @@ static int aiff_write_trailer(AVFormatContext *s) int ret; AVIOContext *pb = s->pb; AIFFOutputContext *aiff = s->priv_data; - AVPacketList *pict_list = aiff->pict_list; AVCodecParameters *par = s->streams[aiff->audio_stream_idx]->codecpar; /* Chunks sizes must be even */ @@ -293,12 +273,7 @@ static int aiff_write_trailer(AVFormatContext *s) avio_flush(pb); } - while (pict_list) { - AVPacketList *next = pict_list->next; - av_packet_unref(&pict_list->pkt); - av_freep(&pict_list); - pict_list = next; - } + ff_packet_list_free(&aiff->pict_list, &aiff->pict_list_end); return 0; }

1 0

doc/filters: fix typo
by Paul B Mahol 03 Oct '19

03 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Oct 3 17:58:46 2019 +0200| [93ea21f9b7cc08401218a47dcaf78798fd97c173] | committer: Paul B Mahol doc/filters: fix typo > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=93ea21f9b7cc08401… --- doc/filters.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index 28066d5e62..fbc3a404dd 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -21120,7 +21120,7 @@ __kernel void sierpinski_carpet(__write_only image2d_t dst, @section sierpinski -Generate a Sierpinksi carpet/triangle fractal, and randomly pan around. +Generate a Sierpinski carpet/triangle fractal, and randomly pan around. This source accepts the following options:

1 0

avfilter/vsrc_sierpinski: add triangle type
by Paul B Mahol 03 Oct '19

03 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Oct 3 14:21:39 2019 +0200| [d0189f8d976ff1baed8a01a74420a161019d4cd0] | committer: Paul B Mahol avfilter/vsrc_sierpinski: add triangle type > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d0189f8d976ff1bae… --- doc/filters.texi | 5 ++- libavfilter/vsrc_sierpinski.c | 76 ++++++++++++++++++++++++++++++------------- 2 files changed, 58 insertions(+), 23 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index e46839bfec..28066d5e62 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -21120,7 +21120,7 @@ __kernel void sierpinski_carpet(__write_only image2d_t dst, @section sierpinski -Generate a Sierpinksi carpet fractal, and randomly pan around. +Generate a Sierpinksi carpet/triangle fractal, and randomly pan around. This source accepts the following options: @@ -21138,6 +21138,9 @@ Set seed which is used for random panning. @item jump Set max jump for single pan destination. Allowed range is from 1 to 10000. + +@item type +Set fractal type, can be default @code{carpet} or @code{triangle}. @end table @c man end VIDEO SOURCES diff --git a/libavfilter/vsrc_sierpinski.c b/libavfilter/vsrc_sierpinski.c index 49867d7470..93567ac189 100644 --- a/libavfilter/vsrc_sierpinski.c +++ b/libavfilter/vsrc_sierpinski.c @@ -39,6 +39,7 @@ typedef struct SierpinskiContext { const AVClass *class; int w, h; + int type; AVRational frame_rate; uint64_t pts; @@ -49,6 +50,7 @@ typedef struct SierpinskiContext { int dest_x, dest_y; AVLFG lfg; + int (*draw_slice)(AVFilterContext *ctx, void *arg, int job, int nb_jobs); } SierpinskiContext; #define OFFSET(x) offsetof(SierpinskiContext, x) @@ -61,6 +63,9 @@ static const AVOption sierpinski_options[] = { {"r", "set frame rate", OFFSET(frame_rate), AV_OPT_TYPE_VIDEO_RATE, {.str="25"}, 0, 0, FLAGS }, {"seed", "set the seed", OFFSET(seed), AV_OPT_TYPE_INT, {.i64=-1}, -1, UINT32_MAX, FLAGS }, {"jump", "set the jump", OFFSET(jump), AV_OPT_TYPE_INT, {.i64=100}, 1, 10000, FLAGS }, + {"type","set fractal type",OFFSET(type), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, FLAGS, "type" }, + {"carpet", "sierpinksi carpet", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "type" }, + {"triangle", "sierpinksi triangle", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "type" }, {NULL}, }; @@ -79,25 +84,6 @@ static int query_formats(AVFilterContext *ctx) return ff_set_common_formats(ctx, fmts_list); } -static int config_output(AVFilterLink *inlink) -{ - AVFilterContext *ctx = inlink->src; - SierpinskiContext *s = ctx->priv; - - if (av_image_check_size(s->w, s->h, 0, ctx) < 0) - return AVERROR(EINVAL); - - inlink->w = s->w; - inlink->h = s->h; - inlink->time_base = av_inv_q(s->frame_rate); - inlink->sample_aspect_ratio = (AVRational) {1, 1}; - if (s->seed == -1) - s->seed = av_get_random_seed(); - av_lfg_init(&s->lfg, s->seed); - - return 0; -} - static int fill_sierpinski(SierpinskiContext *s, int x, int y) { int pos_x = x + s->pos_x; @@ -114,7 +100,32 @@ static int fill_sierpinski(SierpinskiContext *s, int x, int y) return 0; } -static int draw_slice(AVFilterContext *ctx, void *arg, int job, int nb_jobs) +static int draw_triangle_slice(AVFilterContext *ctx, void *arg, int job, int nb_jobs) +{ + SierpinskiContext *s = ctx->priv; + AVFrame *frame = arg; + const int width = frame->width; + const int height = frame->height; + const int start = (height * job ) / nb_jobs; + const int end = (height * (job+1)) / nb_jobs; + uint8_t *dst = frame->data[0] + start * frame->linesize[0]; + + for (int y = start; y < end; y++) { + for (int x = 0; x < width; x++) { + if ((s->pos_x + x) & (s->pos_y + y)) { + AV_WL32(&dst[x*4], 0x00000000); + } else { + AV_WL32(&dst[x*4], 0xFFFFFFFF); + } + } + + dst += frame->linesize[0]; + } + + return 0; +} + +static int draw_carpet_slice(AVFilterContext *ctx, void *arg, int job, int nb_jobs) { SierpinskiContext *s = ctx->priv; AVFrame *frame = arg; @@ -139,6 +150,27 @@ static int draw_slice(AVFilterContext *ctx, void *arg, int job, int nb_jobs) return 0; } +static int config_output(AVFilterLink *inlink) +{ + AVFilterContext *ctx = inlink->src; + SierpinskiContext *s = ctx->priv; + + if (av_image_check_size(s->w, s->h, 0, ctx) < 0) + return AVERROR(EINVAL); + + inlink->w = s->w; + inlink->h = s->h; + inlink->time_base = av_inv_q(s->frame_rate); + inlink->sample_aspect_ratio = (AVRational) {1, 1}; + if (s->seed == -1) + s->seed = av_get_random_seed(); + av_lfg_init(&s->lfg, s->seed); + + s->draw_slice = s->type ? draw_triangle_slice : draw_carpet_slice; + + return 0; +} + static void draw_sierpinski(AVFilterContext *ctx, AVFrame *frame) { SierpinskiContext *s = ctx->priv; @@ -162,7 +194,7 @@ static void draw_sierpinski(AVFilterContext *ctx, AVFrame *frame) s->pos_y--; } - ctx->internal->execute(ctx, draw_slice, frame, NULL, FFMIN(outlink->h, ff_filter_get_nb_threads(ctx))); + ctx->internal->execute(ctx, s->draw_slice, frame, NULL, FFMIN(outlink->h, ff_filter_get_nb_threads(ctx))); } static int sierpinski_request_frame(AVFilterLink *link) @@ -193,7 +225,7 @@ static const AVFilterPad sierpinski_outputs[] = { AVFilter ff_vsrc_sierpinski = { .name = "sierpinski", - .description = NULL_IF_CONFIG_SMALL("Render a Sierpinski carpet fractal."), + .description = NULL_IF_CONFIG_SMALL("Render a Sierpinski fractal."), .priv_size = sizeof(SierpinskiContext), .priv_class = &sierpinski_class, .query_formats = query_formats,

1 0

avfilter: add av_cold where it is missing
by Paul B Mahol 03 Oct '19

03 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Oct 3 12:09:07 2019 +0200| [22f3b6286eaa0c05febcf83b065fdb543cbdd604] | committer: Paul B Mahol avfilter: add av_cold where it is missing > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=22f3b6286eaa0c05f… --- libavfilter/af_flanger.c | 2 +- libavfilter/af_surround.c | 2 +- libavfilter/vf_colorspace.c | 2 +- libavfilter/vf_delogo.c | 2 +- libavfilter/vf_eq.c | 2 +- libavfilter/vf_tpad.c | 2 +- libavfilter/vf_xbr.c | 2 +- libavfilter/vf_zscale.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libavfilter/af_flanger.c b/libavfilter/af_flanger.c index b7497a12ed..33c8245ea5 100644 --- a/libavfilter/af_flanger.c +++ b/libavfilter/af_flanger.c @@ -72,7 +72,7 @@ static const AVOption flanger_options[] = { AVFILTER_DEFINE_CLASS(flanger); -static int init(AVFilterContext *ctx) +static av_cold int init(AVFilterContext *ctx) { FlangerContext *s = ctx->priv; diff --git a/libavfilter/af_surround.c b/libavfilter/af_surround.c index 5a4eca7755..11406786ee 100644 --- a/libavfilter/af_surround.c +++ b/libavfilter/af_surround.c @@ -1372,7 +1372,7 @@ static void filter_5_1_back(AVFilterContext *ctx) } } -static int init(AVFilterContext *ctx) +static av_cold int init(AVFilterContext *ctx) { AudioSurroundContext *s = ctx->priv; float overlap; diff --git a/libavfilter/vf_colorspace.c b/libavfilter/vf_colorspace.c index f414209ea2..04954c1be4 100644 --- a/libavfilter/vf_colorspace.c +++ b/libavfilter/vf_colorspace.c @@ -732,7 +732,7 @@ static int create_filtergraph(AVFilterContext *ctx, return 0; } -static int init(AVFilterContext *ctx) +static av_cold int init(AVFilterContext *ctx) { ColorSpaceContext *s = ctx->priv; diff --git a/libavfilter/vf_delogo.c b/libavfilter/vf_delogo.c index 814575a36c..376c5e850f 100644 --- a/libavfilter/vf_delogo.c +++ b/libavfilter/vf_delogo.c @@ -221,7 +221,7 @@ static const AVOption delogo_options[]= { }; AVFILTER_DEFINE_CLASS(delogo); -static void uninit(AVFilterContext *ctx) +static av_cold void uninit(AVFilterContext *ctx) { DelogoContext *s = ctx->priv; diff --git a/libavfilter/vf_eq.c b/libavfilter/vf_eq.c index 0f9d129255..914a07f176 100644 --- a/libavfilter/vf_eq.c +++ b/libavfilter/vf_eq.c @@ -207,7 +207,7 @@ static int initialize(AVFilterContext *ctx) return 0; } -static void uninit(AVFilterContext *ctx) +static av_cold void uninit(AVFilterContext *ctx) { EQContext *eq = ctx->priv; diff --git a/libavfilter/vf_tpad.c b/libavfilter/vf_tpad.c index 86e063090b..0cd65d3e7b 100644 --- a/libavfilter/vf_tpad.c +++ b/libavfilter/vf_tpad.c @@ -181,7 +181,7 @@ static int config_input(AVFilterLink *inlink) return 0; } -static void uninit(AVFilterContext *ctx) +static av_cold void uninit(AVFilterContext *ctx) { TPadContext *s = ctx->priv; diff --git a/libavfilter/vf_xbr.c b/libavfilter/vf_xbr.c index 87810c88f1..a381be4553 100644 --- a/libavfilter/vf_xbr.c +++ b/libavfilter/vf_xbr.c @@ -380,7 +380,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) return ff_filter_frame(outlink, out); } -static int init(AVFilterContext *ctx) +static av_cold int init(AVFilterContext *ctx) { XBRContext *s = ctx->priv; static const xbrfunc_t xbrfuncs[] = {xbr2x, xbr3x, xbr4x}; diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c index 9b0d08625f..db2dd17756 100644 --- a/libavfilter/vf_zscale.c +++ b/libavfilter/vf_zscale.c @@ -702,7 +702,7 @@ fail: return ff_filter_frame(outlink, out); } -static void uninit(AVFilterContext *ctx) +static av_cold void uninit(AVFilterContext *ctx) { ZScaleContext *s = ctx->priv;

1 0

avfilter/f_streamselect: fix memleaks of pad names
by Paul B Mahol 03 Oct '19

03 Oct '19

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Oct 3 11:23:23 2019 +0200| [8ca89e52df89b87b278f9d7e369d1b064b740415] | committer: Paul B Mahol avfilter/f_streamselect: fix memleaks of pad names > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8ca89e52df89b87b2… --- libavfilter/f_streamselect.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavfilter/f_streamselect.c b/libavfilter/f_streamselect.c index 4b913d37f4..7a1ff775f4 100644 --- a/libavfilter/f_streamselect.c +++ b/libavfilter/f_streamselect.c @@ -294,6 +294,12 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->map); av_freep(&s->frames); ff_framesync_uninit(&s->fs); + + for (int i = 0; i < ctx->nb_inputs; i++) + av_freep(&ctx->input_pads[i].name); + + for (int i = 0; i < ctx->nb_outputs; i++) + av_freep(&ctx->output_pads[i].name); } static int query_formats(AVFilterContext *ctx)

1 0