[SCM] libav/experimental: Original Commit: r84 | ods15 | 2006-09-29 21:07:07 +0300 (Fri, 29 Sep 2006) | 2 lines

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 866bfee3734b2eaacbe944da6238da941d8c52f2
Author: Oded Shimon <ods15 at ods15.dyndns.org>
Date:   Mon Oct 2 06:08:44 2006 +0000

    Original Commit: r84 | ods15 | 2006-09-29 21:07:07 +0300 (Fri, 29 Sep 2006) | 2 lines
    
    dangling piece from last commit
    
    Originally committed as revision 6489 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/vorbis_enc.c b/libavcodec/vorbis_enc.c
index edcdfdf..7d7571b 100644
--- a/libavcodec/vorbis_enc.c
+++ b/libavcodec/vorbis_enc.c
@@ -936,8 +936,6 @@ static void residue_encode(venc_context_t * venc, residue_t * rc, PutBitContext
     int classes[channels][partitions];
     int classwords = venc->codebooks[rc->classbook].ndimentions;
 
-    if (rc->type == 2) channels = 1;
-
     assert(rc->type == 2);
     assert(real_ch == 2);
     for (p = 0; p < partitions; p++) {

-- 
Libav/FFmpeg packaging