[FFmpeg-devel] [PATCH 3/4] ffplay: only request 4 or 6 channels from SDL, if SDL version is at least 1.2.8

Marton Balint cus at passwd.hu
Tue May 29 22:57:25 CEST 2012


Signed-off-by: Marton Balint <cus at passwd.hu>
---
 ffplay.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ffplay.c b/ffplay.c
index 44ae931..2fae0e5 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);
             }
-- 
1.7.3.4



More information about the ffmpeg-devel mailing list