Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Marth64 <marth64@proxyid.net>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Subject: Re: [FFmpeg-devel] [PATCH 3/3] avformat/rcwtenc: Pass RCWTContext directly in rcwt_init_cluster()
Date: Fri, 9 Feb 2024 01:34:43 -0600
Message-ID: <CA+28BfB9Xq24iWzBJ4siSsOdVmTsCv5YpX5Gmw61v6t_pKkVpw@mail.gmail.com> (raw)
In-Reply-To: <AS8P250MB0744DDD3CAA7107B851CB2448F442@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM>

v2 set LGTM. I verified with ATSC and DVD sources. Thank you.

On Thu, Feb 8, 2024 at 9:08 AM Andreas Rheinhardt <
andreas.rheinhardt@outlook.com> wrote:

> It does not use the AVFormatContext at all.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavformat/rcwtenc.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/libavformat/rcwtenc.c b/libavformat/rcwtenc.c
> index 084de6e205..7d57fcaf1e 100644
> --- a/libavformat/rcwtenc.c
> +++ b/libavformat/rcwtenc.c
> @@ -70,10 +70,8 @@ typedef struct RCWTContext {
>      uint8_t cluster_buf[RCWT_CLUSTER_MAX_BLOCKS * RCWT_BLOCK_SIZE];
>  } RCWTContext;
>
> -static void rcwt_init_cluster(AVFormatContext *avf)
> +static void rcwt_init_cluster(RCWTContext *rcwt)
>  {
> -    RCWTContext *rcwt = avf->priv_data;
> -
>      rcwt->cluster_pos = 0;
>      rcwt->cluster_pts = AV_NOPTS_VALUE;
>  }
> @@ -88,7 +86,7 @@ static void rcwt_flush_cluster(AVFormatContext *avf)
>          avio_write(avf->pb, rcwt->cluster_buf, rcwt->cluster_pos);
>      }
>
> -    rcwt_init_cluster(avf);
> +    rcwt_init_cluster(rcwt);
>  }
>
>  static int rcwt_write_header(AVFormatContext *avf)
> @@ -117,7 +115,7 @@ static int rcwt_write_header(AVFormatContext *avf)
>      avio_wb16(avf->pb, 0x000);
>      avio_w8(avf->pb, 0x00);
>
> -    rcwt_init_cluster(avf);
> +    rcwt_init_cluster(avf->priv_data);
>
>      return 0;
>  }
> --
> 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".
>
_______________________________________________
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".

      reply	other threads:[~2024-02-09  7:35 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-08 15:08 [FFmpeg-devel] [PATCH 1/3] avformat/rcwtenc: Fix potential out-of-bounds write Andreas Rheinhardt
2024-02-08 15:09 ` [FFmpeg-devel] [PATCH 2/3] avformat/rcwtenc: Remove redundant zeroing of buffer Andreas Rheinhardt
2024-02-08 15:09 ` [FFmpeg-devel] [PATCH 3/3] avformat/rcwtenc: Pass RCWTContext directly in rcwt_init_cluster() Andreas Rheinhardt
2024-02-09  7:34   ` Marth64 [this message]

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=CA+28BfB9Xq24iWzBJ4siSsOdVmTsCv5YpX5Gmw61v6t_pKkVpw@mail.gmail.com \
    --to=marth64@proxyid.net \
    --cc=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