[vlc-devel] commit: Fixed a regression with avcodec due to 83f58a5076e659f63f47575c0c350b58367eaff0 (Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Tue May  5 23:30:53 2009 +0200| [68dec8670a621d028aa3e547fd23642ce0bdcdbd] | committer: Laurent Aimar 

Fixed a regression with avcodec due to 83f58a5076e659f63f47575c0c350b58367eaff0

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

 modules/codec/avcodec/audio.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c
index c9cbd31..79c0aa0 100644
--- a/modules/codec/avcodec/audio.c
+++ b/modules/codec/avcodec/audio.c
@@ -457,10 +457,12 @@ static void SetupOutputFormat( decoder_t *p_dec, bool b_trust )
     p_dec->fmt_out.audio.i_channels = p_sys->p_context->channels;
 
     /* */
-    if( p_sys->i_previous_channels == p_sys->p_context->channels )
-        return;
 #if defined(LIBAVCODEC_AUDIO_LAYOUT)
-    if( p_sys->i_previous_layout == p_sys->p_context->channel_layout )
+    if( p_sys->i_previous_channels == p_sys->p_context->channels &&
+        p_sys->i_previous_layout == p_sys->p_context->channel_layout )
+        return;
+#else
+    if( p_sys->i_previous_channels == p_sys->p_context->channels )
         return;
 #endif
     if( b_trust )