[FFmpeg-devel] [PATCH 3/4] lswr: fix assert failure on unknown layouts.

[Stefano Sabatini]

On date Friday 2013-10-25 16:20:57 +0200, Nicolas George encoded:
> Signed-off-by: Nicolas George <george at nsup.org>
> ---
>  libswresample/rematrix.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c
> index 5c98e68..e146edf 100644
> --- a/libswresample/rematrix.c
> +++ b/libswresample/rematrix.c
> @@ -433,8 +433,8 @@ int swri_rematrix(SwrContext *s, AudioData *out, AudioData *in, int len, int mus
>          off = len1 * out->bps;
>      }
>  
> -    av_assert0(out->ch_count == av_get_channel_layout_nb_channels(s->out_ch_layout));
> -    av_assert0(in ->ch_count == av_get_channel_layout_nb_channels(s-> in_ch_layout));
> +    av_assert0(!s->out_ch_layout || out->ch_count == av_get_channel_layout_nb_channels(s->out_ch_layout));
> +    av_assert0(!s-> in_ch_layout || in ->ch_count == av_get_channel_layout_nb_channels(s-> in_ch_layout));

LGTM but probably Michael should confirm.
-- 
FFmpeg = Formidable and Furious Mean Powered Egregious Geisha