[Ffmpeg-cvslog] r6487 - trunk/libavcodec/vorbis_enc.c

[ods15]

Author: ods15
Date: Mon Oct  2 08:08:39 2006
New Revision: 6487

Modified:
   trunk/libavcodec/vorbis_enc.c

Log:
Original Commit: r82 | ods15 | 2006-09-29 21:03:43 +0300 (Fri, 29 Sep 2006) | 2 lines

fix channels to be correct for rc->type==2 before classes[] decleration

Modified: trunk/libavcodec/vorbis_enc.c
==============================================================================
--- trunk/libavcodec/vorbis_enc.c	(original)
+++ trunk/libavcodec/vorbis_enc.c	Mon Oct  2 08:08:39 2006
@@ -923,13 +923,13 @@
     return &book->dimentions[entry * book->ndimentions];
 }
 
-static void residue_encode(venc_context_t * venc, residue_t * rc, PutBitContext * pb, float * coeffs, int samples, int channels) {
+static void residue_encode(venc_context_t * venc, residue_t * rc, PutBitContext * pb, float * coeffs, int samples, int real_ch) {
     int pass, i, j, p, k;
     int psize = rc->partition_size;
     int partitions = (rc->end - rc->begin) / psize;
+    int channels = (rc->type == 2) ? 1 : real_ch;
     int classes[channels][partitions];
     int classwords = venc->codebooks[rc->classbook].ndimentions;
-    int real_ch = channels;
 
     if (rc->type == 2) channels = 1;