* [FFmpeg-devel] [PATCH v1] libavfilter/af_channelsplit.c:fix memory leak
@ 2024-04-12 9:19 LuMingYin
2024-04-12 9:49 ` Zhao Zhili
0 siblings, 1 reply; 3+ messages in thread
From: LuMingYin @ 2024-04-12 9:19 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: lumingyindetect
Signed-off-by: LuMingYin <lumingyindetect@163.com>
---
libavfilter/af_channelsplit.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavfilter/af_channelsplit.c b/libavfilter/af_channelsplit.c
index d18d91dcb6..2cfac19cd3 100644
--- a/libavfilter/af_channelsplit.c
+++ b/libavfilter/af_channelsplit.c
@@ -163,8 +163,10 @@ static int filter_frame(AVFilterLink *outlink, AVFrame *buf)
buf_out->data[0] = buf_out->extended_data[0] = buf_out->extended_data[s->map[i]];
ret = av_channel_layout_from_mask(&buf_out->ch_layout, 1ULL << channel);
- if (ret < 0)
+ if (ret < 0){
+ av_frame_free(&buf_out);
return ret;
+ }
return ff_filter_frame(ctx->outputs[i], buf_out);
}
--
2.25.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".
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [FFmpeg-devel] [PATCH v1] libavfilter/af_channelsplit.c:fix memory leak
2024-04-12 9:19 [FFmpeg-devel] [PATCH v1] libavfilter/af_channelsplit.c:fix memory leak LuMingYin
@ 2024-04-12 9:49 ` Zhao Zhili
2024-04-15 2:47 ` Zhao Zhili
0 siblings, 1 reply; 3+ messages in thread
From: Zhao Zhili @ 2024-04-12 9:49 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: lumingyindetect
> On Apr 12, 2024, at 17:19, LuMingYin <lumingyindetect@163.com> wrote:
>
> Signed-off-by: LuMingYin <lumingyindetect@163.com>
> ---
> libavfilter/af_channelsplit.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/libavfilter/af_channelsplit.c b/libavfilter/af_channelsplit.c
> index d18d91dcb6..2cfac19cd3 100644
> --- a/libavfilter/af_channelsplit.c
> +++ b/libavfilter/af_channelsplit.c
> @@ -163,8 +163,10 @@ static int filter_frame(AVFilterLink *outlink, AVFrame *buf)
>
> buf_out->data[0] = buf_out->extended_data[0] = buf_out->extended_data[s->map[i]];
> ret = av_channel_layout_from_mask(&buf_out->ch_layout, 1ULL << channel);
> - if (ret < 0)
> + if (ret < 0){
> + av_frame_free(&buf_out);
> return ret;
> + }
LGTM. Please pay attention to the coding style. I can fix it manually this time.
>
> return ff_filter_frame(ctx->outputs[i], buf_out);
> }
> --
> 2.25.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".
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [FFmpeg-devel] [PATCH v1] libavfilter/af_channelsplit.c:fix memory leak
2024-04-12 9:49 ` Zhao Zhili
@ 2024-04-15 2:47 ` Zhao Zhili
0 siblings, 0 replies; 3+ messages in thread
From: Zhao Zhili @ 2024-04-15 2:47 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: lumingyindetect
> On Apr 12, 2024, at 17:49, Zhao Zhili <quinkblack@foxmail.com> wrote:
>
>
>> On Apr 12, 2024, at 17:19, LuMingYin <lumingyindetect@163.com> wrote:
>>
>> Signed-off-by: LuMingYin <lumingyindetect@163.com>
>> ---
>> libavfilter/af_channelsplit.c | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/libavfilter/af_channelsplit.c b/libavfilter/af_channelsplit.c
>> index d18d91dcb6..2cfac19cd3 100644
>> --- a/libavfilter/af_channelsplit.c
>> +++ b/libavfilter/af_channelsplit.c
>> @@ -163,8 +163,10 @@ static int filter_frame(AVFilterLink *outlink, AVFrame *buf)
>>
>> buf_out->data[0] = buf_out->extended_data[0] = buf_out->extended_data[s->map[i]];
>> ret = av_channel_layout_from_mask(&buf_out->ch_layout, 1ULL << channel);
>> - if (ret < 0)
>> + if (ret < 0){
>> + av_frame_free(&buf_out);
>> return ret;
>> + }
>
> LGTM. Please pay attention to the coding style. I can fix it manually this time.
Applied as 5e380bcdb13dd47ce9c358a4edb281f05fde3f24.
>
>>
>> return ff_filter_frame(ctx->outputs[i], buf_out);
>> }
>> --
>> 2.25.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".
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-04-15 2:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-12 9:19 [FFmpeg-devel] [PATCH v1] libavfilter/af_channelsplit.c:fix memory leak LuMingYin
2024-04-12 9:49 ` Zhao Zhili
2024-04-15 2:47 ` Zhao Zhili
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git