[SCM] libav/experimental: Bugfix for bug introduced in the multichannel cook patchset.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit e5cd2d3dca3bbba1961ee373fde24c5e112b0d80
Author: Benjamin Larsson <banan at ludd.ltu.se>
Date:   Fri May 15 16:25:54 2009 +0000

    Bugfix for bug introduced in the multichannel cook patchset.
    
    Originally committed as revision 18842 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index a33222b..fa9dc2b 100644
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -1141,9 +1141,10 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
                 av_log(avctx,AV_LOG_DEBUG,"MONO\n");
                 break;
             case STEREO:
-                if (q->nb_channels != 1)
+                if (q->nb_channels != 1) {
                     q->subpacket[s].bits_per_subpdiv = 1;
-                q->subpacket[s].num_channels = 2;
+                    q->subpacket[s].num_channels = 2;
+                }
                 av_log(avctx,AV_LOG_DEBUG,"STEREO\n");
                 break;
             case JOINT_STEREO:

-- 
Libav/FFmpeg packaging