Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH] swresample/swresample: fix assert failure
Date: Fri, 9 Sep 2022 08:58:00 -0300
Message-ID: <4c19d019-bb6c-558d-2ae5-3e6e341211bd@gmail.com> (raw)
In-Reply-To: <tencent_6C9C6A1E01B16B167EC6AC1E3859C11DB70A@qq.com>

I sent an alternative approach last night.

On 9/9/2022 3:20 PM, Zhao Zhili wrote:
> From: Zhao Zhili <zhilizhao@tencent.com>
> 
> Fix #9908. Regression since 8a5896ec1f6.
> 
> Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
> ---
>   libswresample/swresample.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/libswresample/swresample.c b/libswresample/swresample.c
> index 6f04d130d3..624309c2a0 100644
> --- a/libswresample/swresample.c
> +++ b/libswresample/swresample.c
> @@ -265,12 +265,14 @@ av_cold int swr_init(struct SwrContext *s){
>           av_channel_layout_describe(&s->in_ch_layout, l1, sizeof(l1));
>           av_log(s, AV_LOG_WARNING, "Input channel layout \"%s\" is invalid or unsupported.\n", l1);
>           av_channel_layout_uninit(&s->in_ch_layout);
> +        s->in.ch_count = 0;
>       }
>   
>       if (!av_channel_layout_check(&s->out_ch_layout) || s->out_ch_layout.nb_channels > SWR_CH_MAX) {
>           av_channel_layout_describe(&s->out_ch_layout, l2, sizeof(l2));
>           av_log(s, AV_LOG_WARNING, "Output channel layout \"%s\" is invalid or unsupported.\n", l2);
>           av_channel_layout_uninit(&s->out_ch_layout);
> +        s->out.ch_count = 0;
>       }
>   
>       switch(s->engine){
_______________________________________________
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:[~2022-09-09 12:03 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-09 18:20 Zhao Zhili
2022-09-09 11:58 ` James Almer [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=4c19d019-bb6c-558d-2ae5-3e6e341211bd@gmail.com \
    --to=jamrial@gmail.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