[vlc-commits] Revert "faad: try to guess channel count if we can, and don' t set it to 0 in Open"

[Ilkka Ollakka]

vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Wed Dec  4 09:45:18 2013 +0200| [3baacdbeacd98fe027232342cfe25ff19917854b] | committer: Ilkka Ollakka

Revert "faad: try to guess channel count if we can, and don't set it to 0 in Open"

This reverts commit c2e4f7c67765ab9ef464f4e320128056133d5f3a.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3baacdbeacd98fe027232342cfe25ff19917854b
---

 modules/codec/faad.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/codec/faad.c b/modules/codec/faad.c
index 9b7b791..6aba913 100644
--- a/modules/codec/faad.c
+++ b/modules/codec/faad.c
@@ -179,9 +179,7 @@ static int Open( vlc_object_t *p_this )
     {
         /* Will be initalised from first frame */
         p_dec->fmt_out.audio.i_rate = 0;
-        /*FIXME: Try to guess channel count, so transcode module doesn't burb and do funny stuff
-            Revert back to 0 when transcode module/audio encoders can reinit stuff after Open()*/
-        p_dec->fmt_out.audio.i_channels = p_dec->fmt_in.audio.i_channels;
+        p_dec->fmt_out.audio.i_channels = 0;
     }
 
     /* Set the faad config */