From 15751e3fdd66f595f25692d180d6f154af2da11c Mon Sep 17 00:00:00 2001 From: Marton Balint Date: Tue, 27 Mar 2012 22:28:28 +0200 Subject: ffplay: only request 4 or 6 channels from SDL, if SDL version is at least 1.2.8 Signed-off-by: Marton Balint --- ffplay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffplay.c b/ffplay.c index 44ae931601..2fae0e5996 100644 --- a/ffplay.c +++ b/ffplay.c @@ -2299,7 +2299,7 @@ static int stream_component_open(VideoState *is, int stream_index) 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. */ - while (wanted_nb_channels > 0 && (wanted_nb_channels == 3 || wanted_nb_channels == 5 || wanted_nb_channels > 6)) { + while (wanted_nb_channels > 0 && (wanted_nb_channels == 3 || wanted_nb_channels == 5 || wanted_nb_channels > (SDL_VERSION_ATLEAST(1, 2, 8) ? 6 : 2))) { wanted_nb_channels--; wanted_channel_layout = av_get_default_channel_layout(wanted_nb_channels); } -- cgit v1.2.3