From: Laurent Aimar <fenrir@videolan.org>
Date: Tue, 5 May 2009 21:30:53 +0000 (+0200)
Subject: Fixed a regression with avcodec due to 83f58a5076e659f63f47575c0c350b58367eaff0
X-Git-Tag: 1.0.0-rc1~72
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=68dec8670a621d028aa3e547fd23642ce0bdcdbd;p=vlc

Fixed a regression with avcodec due to 83f58a5076e659f63f47575c0c350b58367eaff0
---

diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c
index c9cbd3148c..79c0aa042f 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 )