From 8ee77fc8d4034924c4151304e274bf65809aec39 Mon Sep 17 00:00:00 2001 From: Marton Balint Date: Wed, 4 Jan 2012 22:50:09 +0100 Subject: [PATCH] ffplay: fix invalid wanted_channel_layout calculation Signed-off-by: Marton Balint --- ffplay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffplay.c b/ffplay.c index 46426e74f4..1a1b3f714b 100644 --- a/ffplay.c +++ b/ffplay.c @@ -2263,7 +2263,7 @@ static int stream_component_open(VideoState *is, int stream_index) if (env) wanted_channel_layout = av_get_default_channel_layout(SDL_atoi(env)); if (!wanted_channel_layout) { - wanted_channel_layout = (avctx->channel_layout && avctx->channels == av_get_channel_layout_nb_channels(avctx->channels)) ? avctx->channel_layout : av_get_default_channel_layout(avctx->channels); + wanted_channel_layout = (avctx->channel_layout && avctx->channels == av_get_channel_layout_nb_channels(avctx->channel_layout)) ? avctx->channel_layout : av_get_default_channel_layout(avctx->channels); wanted_channel_layout &= ~AV_CH_LAYOUT_STEREO_DOWNMIX; wanted_nb_channels = av_get_channel_layout_nb_channels(wanted_channel_layout); /* SDL only supports 1, 2, 4 or 6 channels at the moment, so we have to make sure not to request anything else. */