virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avfilter/f_ebur128: Don't allocate outpad names

Browse Source 
These names are mostly the same, so not using duplicates saves
allocations, checks for the allocations as well as frees.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt
2020-08-22 04:13:28 +02:00
parent 925d2f4f5b
commit 9b34600bd2
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavfilter/f_ebur128.c
View File

@@ -527,30 +527,22 @@ static av_cold int init(AVFilterContext *ctx)
/* insert output pads */ /* insert output pads */
if (ebur128->do_video) { if (ebur128->do_video) {
pad = (AVFilterPad){ pad = (AVFilterPad){
.name = av_strdup("out0"), .name = "out0",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.config_props = config_video_output, .config_props = config_video_output,
}; };
if (!pad.name)
return AVERROR(ENOMEM);
ret = ff_insert_outpad(ctx, 0, &pad); ret = ff_insert_outpad(ctx, 0, &pad);
if (ret < 0) { if (ret < 0)
av_freep(&pad.name);
return ret; return ret;
}
} }
pad = (AVFilterPad){ pad = (AVFilterPad){
.name = av_asprintf("out%d", ebur128->do_video), .name = ebur128->do_video ? "out1" : "out0",
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.config_props = config_audio_output, .config_props = config_audio_output,
}; };
if (!pad.name)
return AVERROR(ENOMEM);
ret = ff_insert_outpad(ctx, ebur128->do_video, &pad); ret = ff_insert_outpad(ctx, ebur128->do_video, &pad);
if (ret < 0) { if (ret < 0)
av_freep(&pad.name);
return ret; return ret;
}
/* summary */ /* summary */
av_log(ctx, AV_LOG_VERBOSE, "EBU +%d scale\n", ebur128->meter); av_log(ctx, AV_LOG_VERBOSE, "EBU +%d scale\n", ebur128->meter);
@@ -990,8 +982,6 @@ static av_cold void uninit(AVFilterContext *ctx)
av_freep(&ebur128->i400.cache[i]); av_freep(&ebur128->i400.cache[i]);
av_freep(&ebur128->i3000.cache[i]); av_freep(&ebur128->i3000.cache[i]);
} }
for (i = 0; i < ctx->nb_outputs; i++)
av_freep(&ctx->output_pads[i].name);
av_frame_free(&ebur128->outpicref); av_frame_free(&ebur128->outpicref);
#if CONFIG_SWRESAMPLE #if CONFIG_SWRESAMPLE
av_freep(&ebur128->swr_buf); av_freep(&ebur128->swr_buf);