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 (file)
--- 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:
                 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].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:
                 av_log(avctx,AV_LOG_DEBUG,"STEREO\n");
                 break;
             case JOINT_STEREO: