avplay: don't request a stereo downmix
authorJustin Ruggles <justin.ruggles@gmail.com>
Sat, 10 Dec 2011 21:59:55 +0000 (16:59 -0500)
committerJustin Ruggles <justin.ruggles@gmail.com>
Sun, 11 Dec 2011 19:01:27 +0000 (14:01 -0500)
Multi-channel output works just fine for me with SDL 1.2.14.

avplay.c

index 69cd617..fd9774e 100644 (file)
--- a/avplay.c
+++ b/avplay.c
@@ -2175,15 +2175,6 @@ static int stream_component_open(VideoState *is, int stream_index)
 
     opts = filter_codec_opts(codec_opts, avctx->codec_id, ic, ic->streams[stream_index]);
 
-    /* prepare audio output */
-    if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) {
-        if (avctx->channels > 0) {
-            avctx->request_channels = FFMIN(2, avctx->channels);
-        } else {
-            avctx->request_channels = 2;
-        }
-    }
-
     codec = avcodec_find_decoder(avctx->codec_id);
     avctx->debug_mv = debug_mv;
     avctx->debug = debug;