[FFmpeg-devel] [PATCH] avcodec/pthread_frame: Fix leak of coded side data

[FFmpeg-devel] [PATCH] avcodec/pthread_frame: Fix leak of coded side data

[Andreas Rheinhardt]

Happens in the mov-elst-ends-betn-b-and-i FATE test with
frame-threading.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/pthread_frame.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c
index f19571f6f8..a984ff94d5 100644
--- a/libavcodec/pthread_frame.c
+++ b/libavcodec/pthread_frame.c
@@ -731,6 +731,8 @@ void ff_frame_thread_free(AVCodecContext *avctx, int thread_count)
             av_packet_free(&ctx->internal->last_pkt_props);
             av_freep(&ctx->internal);
             av_buffer_unref(&ctx->hw_frames_ctx);
+            av_frame_side_data_free(&ctx->decoded_side_data,
+                                    &ctx->nb_decoded_side_data);
         }
 
         av_frame_free(&p->frame);
-- 
2.40.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".

Re: [FFmpeg-devel] [PATCH] avcodec/pthread_frame: Fix leak of coded side data

[Andreas Rheinhardt]

Andreas Rheinhardt:
> Happens in the mov-elst-ends-betn-b-and-i FATE test with
> frame-threading.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavcodec/pthread_frame.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c
> index f19571f6f8..a984ff94d5 100644
> --- a/libavcodec/pthread_frame.c
> +++ b/libavcodec/pthread_frame.c
> @@ -731,6 +731,8 @@ void ff_frame_thread_free(AVCodecContext *avctx, int thread_count)
>              av_packet_free(&ctx->internal->last_pkt_props);
>              av_freep(&ctx->internal);
>              av_buffer_unref(&ctx->hw_frames_ctx);
> +            av_frame_side_data_free(&ctx->decoded_side_data,
> +                                    &ctx->nb_decoded_side_data);
>          }
>  
>          av_frame_free(&p->frame);

Will apply this patch tomorrow unless there are objections.

- Andreas

_______________________________________________
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".

Re: [FFmpeg-devel] [PATCH] avcodec/pthread_frame: Fix leak of coded side data

[James Almer]

On 4/18/2024 6:30 PM, Andreas Rheinhardt wrote:
> Happens in the mov-elst-ends-betn-b-and-i FATE test with
> frame-threading.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>   libavcodec/pthread_frame.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c
> index f19571f6f8..a984ff94d5 100644
> --- a/libavcodec/pthread_frame.c
> +++ b/libavcodec/pthread_frame.c
> @@ -731,6 +731,8 @@ void ff_frame_thread_free(AVCodecContext *avctx, int thread_count)
>               av_packet_free(&ctx->internal->last_pkt_props);
>               av_freep(&ctx->internal);
>               av_buffer_unref(&ctx->hw_frames_ctx);
> +            av_frame_side_data_free(&ctx->decoded_side_data,
> +                                    &ctx->nb_decoded_side_data);

LGTM.
_______________________________________________
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".