From 0d939a6847b139a29aaa21bd0b73d5fa28c6fb03 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 5 Apr 2013 23:41:31 +0200
Subject: af: fix negotiation endless loop

Yeah... ok.

Can be reproduced by having AF_CONTROL_CHANNELS not really set the
correct channel map.
---
 audio/filter/af.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'audio')

diff --git a/audio/filter/af.c b/audio/filter/af.c
index 51dbd3fa77..9f534ad2fb 100644
--- a/audio/filter/af.c
+++ b/audio/filter/af.c
@@ -443,8 +443,8 @@ int af_reinit(struct af_stream *s)
     // filter which needs no initialization.
     struct af_instance *af = s->first->next;
     int retry = 0;
-    while (af && retry < 5) {
-        if (retry >= 5)
+    while (af) {
+        if (retry >= 20)
             goto negotiate_error;
 
         // Check if this is the first filter
@@ -492,7 +492,6 @@ int af_reinit(struct af_stream *s)
             af_print_filter_chain(s, af);
             return AF_ERROR;
         }
-        retry = 0;
     }
 
     af_print_filter_chain(s, NULL);
-- 
cgit v1.2.3