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

[Ilkka Ollakka]

vlc/vlc-2.1 | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Sun Sep 22 12:27:34 2013 +0300| [3339432d0625a0228df07281d3d0fdc5919b2d56] | committer: Jean-Baptiste Kempf

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

Ref #9200

(cherry picked from commit c2e4f7c67765ab9ef464f4e320128056133d5f3a)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=3339432d0625a0228df07281d3d0fdc5919b2d56
---

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

diff --git a/modules/codec/faad.c b/modules/codec/faad.c
index 6aba913..9b7b791 100644
--- a/modules/codec/faad.c
+++ b/modules/codec/faad.c
@@ -179,7 +179,9 @@ static int Open( vlc_object_t *p_this )
     {
         /* Will be initalised from first frame */
         p_dec->fmt_out.audio.i_rate = 0;
-        p_dec->fmt_out.audio.i_channels = 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;
     }
 
     /* Set the faad config */