From 63b5e99fab045ff4819fa11b916161835e219e11 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Wed, 8 Feb 2012 17:28:02 +0100 Subject: [PATCH] ffmpeg: make use of ret error out in transcode_video(). --- ffmpeg.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index a02b1a9151..abbd71e628 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2135,10 +2135,10 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int goto cont; } if (!ist->filtered_frame && !(ist->filtered_frame = avcodec_alloc_frame())) { - av_free(buffer_to_free); - return AVERROR(ENOMEM); - } else - avcodec_get_frame_defaults(ist->filtered_frame); + ret = AVERROR(ENOMEM); + goto end; + } + avcodec_get_frame_defaults(ist->filtered_frame); filtered_frame = ist->filtered_frame; *filtered_frame= *decoded_frame; //for me_threshold if (ost->picref) { @@ -2158,6 +2158,7 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int #endif } +end: av_free(buffer_to_free); return ret; } -- 2.11.0