Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Paul B Mahol <onemda@gmail.com>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH] avfilter/src_movie: support unknown channel layouts
Date: Mon, 31 Oct 2022 21:23:56 +0100
Message-ID: <CAPYw7P4qFj6mdK5p_S4o4sHsP+RF1yDgisz5L_oJY3yuMOT-jQ@mail.gmail.com> (raw)
In-Reply-To: <CAPYw7P5CV0zX-w6v0Y+ok9OgXRbfJ4iih_YNtP6jQAN2b4E4Rw@mail.gmail.com>

[-- Attachment #1: Type: text/plain, Size: 95 bytes --]

On 10/31/22, Paul B Mahol <onemda@gmail.com> wrote:
> Patch attached.
>

Fixed patch attached.

[-- Attachment #2: 0001-avfilter-src_movie-support-unknown-channel-layouts.patch --]
[-- Type: text/x-patch, Size: 1163 bytes --]

From 17a5d411ff9a130aab7b9f638c94b35281f20133 Mon Sep 17 00:00:00 2001
From: Paul B Mahol <onemda@gmail.com>
Date: Mon, 31 Oct 2022 12:55:17 +0100
Subject: [PATCH] avfilter/src_movie: support unknown channel layouts

Signed-off-by: Paul B Mahol <onemda@gmail.com>
---
 libavfilter/src_movie.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c
index 711854c23c..5937613d13 100644
--- a/libavfilter/src_movie.c
+++ b/libavfilter/src_movie.c
@@ -196,11 +196,11 @@ static int guess_channel_layout(MovieStream *st, int st_index, void *log_ctx)
     av_channel_layout_default(&chl, dec_par->ch_layout.nb_channels);
 
     if (!KNOWN(&chl)) {
-        av_log(log_ctx, AV_LOG_ERROR,
+        av_log(log_ctx, AV_LOG_WARNING,
                "Channel layout is not set in stream %d, and could not "
                "be guessed from the number of channels (%d)\n",
                st_index, dec_par->ch_layout.nb_channels);
-        return AVERROR(EINVAL);
+        return av_channel_layout_copy(&dec_par->ch_layout, &chl);
     }
 
     av_channel_layout_describe(&chl, buf, sizeof(buf));
-- 
2.37.2


[-- Attachment #3: Type: text/plain, Size: 251 bytes --]

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

  parent reply	other threads:[~2022-10-31 20:24 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-31 11:53 Paul B Mahol
2022-10-31 12:15 ` Andreas Rheinhardt
2022-10-31 19:40   ` James Almer
2022-10-31 20:23 ` Paul B Mahol [this message]
2022-11-01 15:25   ` Paul B Mahol

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=CAPYw7P4qFj6mdK5p_S4o4sHsP+RF1yDgisz5L_oJY3yuMOT-jQ@mail.gmail.com \
    --to=onemda@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