highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avdevice/caca: Make deinit function out of write_trailer

Browse Source 
Fixes memleaks in case the trailer is never written.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2021-10-09 10:30:54 +02:00
parent 8f26ebde14
commit 395803c78f
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libavdevice/caca.c
View File

@@ -41,7 +41,7 @@ typedef struct CACAContext {
int list_drivers; int list_drivers;
} CACAContext; } CACAContext;
static int caca_write_trailer(AVFormatContext *s) static void caca_deinit(AVFormatContext *s)
{ {
CACAContext *c = s->priv_data; CACAContext *c = s->priv_data;
@@ -59,7 +59,6 @@ static int caca_write_trailer(AVFormatContext *s)
caca_free_canvas(c->canvas); caca_free_canvas(c->canvas);
c->canvas = NULL; c->canvas = NULL;
} }
return 0;
} }
static void list_drivers(CACAContext *c) static void list_drivers(CACAContext *c)
@@ -137,7 +136,7 @@ static int caca_write_header(AVFormatContext *s)
if (!c->canvas) { if (!c->canvas) {
ret = AVERROR(errno); ret = AVERROR(errno);
av_log(s, AV_LOG_ERROR, "Failed to create canvas\n"); av_log(s, AV_LOG_ERROR, "Failed to create canvas\n");
goto fail; return ret;
} }
bpp = av_get_bits_per_pixel(av_pix_fmt_desc_get(encctx->format)); bpp = av_get_bits_per_pixel(av_pix_fmt_desc_get(encctx->format));
@@ -147,7 +146,7 @@ static int caca_write_header(AVFormatContext *s)
if (!c->dither) { if (!c->dither) {
ret = AVERROR(errno); ret = AVERROR(errno);
av_log(s, AV_LOG_ERROR, "Failed to create dither\n"); av_log(s, AV_LOG_ERROR, "Failed to create dither\n");
goto fail; return ret;
} }
#define CHECK_DITHER_OPT(opt) do { \ #define CHECK_DITHER_OPT(opt) do { \
@@ -155,7 +154,7 @@ static int caca_write_header(AVFormatContext *s)
ret = AVERROR(errno); \ ret = AVERROR(errno); \
av_log(s, AV_LOG_ERROR, "Failed to set value '%s' for option '%s'\n", \ av_log(s, AV_LOG_ERROR, "Failed to set value '%s' for option '%s'\n", \
c->opt, #opt); \ c->opt, #opt); \
goto fail; \ return ret; \
} \ } \
} while (0) } while (0)
@@ -169,7 +168,7 @@ static int caca_write_header(AVFormatContext *s)
ret = AVERROR(errno); ret = AVERROR(errno);
av_log(s, AV_LOG_ERROR, "Failed to create display\n"); av_log(s, AV_LOG_ERROR, "Failed to create display\n");
list_drivers(c); list_drivers(c);
goto fail; return ret;
} }
if (!c->window_width || !c->window_height) { if (!c->window_width || !c->window_height) {
@@ -183,10 +182,6 @@ static int caca_write_header(AVFormatContext *s)
caca_set_display_time(c->display, av_rescale_q(1, st->time_base, AV_TIME_BASE_Q)); caca_set_display_time(c->display, av_rescale_q(1, st->time_base, AV_TIME_BASE_Q));
return 0; return 0;
fail:
caca_write_trailer(s);
return ret;
} }
static int caca_write_packet(AVFormatContext *s, AVPacket *pkt) static int caca_write_packet(AVFormatContext *s, AVPacket *pkt)
@@ -235,7 +230,7 @@ const AVOutputFormat ff_caca_muxer = {
.video_codec = AV_CODEC_ID_RAWVIDEO, .video_codec = AV_CODEC_ID_RAWVIDEO,
.write_header = caca_write_header, .write_header = caca_write_header,
.write_packet = caca_write_packet, .write_packet = caca_write_packet,
.write_trailer = caca_write_trailer, .deinit = caca_deinit,
.flags = AVFMT_NOFILE, .flags = AVFMT_NOFILE,
.priv_class = &caca_class, .priv_class = &caca_class,
}; };