From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Subject: [FFmpeg-devel] [PATCH 4/6] avcodec/libx264: Pass x264_picture_t* directly
Date: Mon, 13 Mar 2023 14:22:00 +0100
Message-ID: <AS8P250MB0744C96715BA9177579E3AF78FB99@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <AS8P250MB07442C1C4C96DFD125BF43B18FB89@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/libx264.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index e59939a8a7..df70e9df9b 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -311,11 +311,8 @@ static void reconfig_encoder(AVCodecContext *ctx, const AVFrame *frame)
}
}
-static void free_picture(AVCodecContext *ctx)
+static void free_picture(x264_picture_t *pic)
{
- X264Context *x4 = ctx->priv_data;
- x264_picture_t *pic = &x4->pic;
-
for (int i = 0; i < pic->extra_sei.num_payloads; i++)
av_free(pic->extra_sei.payloads[i].payload);
av_freep(&pic->extra_sei.payloads);
@@ -554,7 +551,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
return 0;
fail:
- free_picture(ctx);
+ free_picture(pic);
*ppic = NULL;
return ret;
}
--
2.34.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".
next prev parent reply other threads:[~2023-03-13 13:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-12 21:52 [FFmpeg-devel] [PATCH 1/3] avfilter/vf_ssim360: Use correct type in sizeof Andreas Rheinhardt
2023-03-12 21:53 ` [FFmpeg-devel] [PATCH 2/3] avfilter/vf_ssim360: Remove dead code Andreas Rheinhardt
2023-03-12 21:53 ` [FFmpeg-devel] [PATCH 3/3] avcodec/libx264: Fix leak in case of allocation failure Andreas Rheinhardt
2023-03-13 13:22 ` Andreas Rheinhardt [this message]
2023-03-13 13:22 ` [FFmpeg-devel] [PATCH 5/6] avcodec/libx264: Use dedicated pointer for accesses Andreas Rheinhardt
2023-03-13 13:22 ` [FFmpeg-devel] [PATCH 6/6] avcodec/libx264: Use av_pix_fmt_count_planes() where appropriate Andreas Rheinhardt
2023-03-13 22:53 ` [FFmpeg-devel] [PATCH 1/3] avfilter/vf_ssim360: Use correct type in sizeof Jan Ekström
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AS8P250MB0744C96715BA9177579E3AF78FB99@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM \
--to=andreas.rheinhardt@outlook.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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