Mercurial > libavcodec.hg
comparison cook.c @ 4951:8f6eda4a0d1e libavcodec
Fix logic for return value of init_vlc
author | ramiro |
---|---|
date | Wed, 09 May 2007 21:50:01 +0000 |
parents | 777f250df232 |
children | 1900e2eaecda |
comparison
equal
deleted
inserted
replaced
4950:665c61d35b52 | 4951:8f6eda4a0d1e |
---|---|
193 static int init_cook_vlc_tables(COOKContext *q) { | 193 static int init_cook_vlc_tables(COOKContext *q) { |
194 int i, result; | 194 int i, result; |
195 | 195 |
196 result = 0; | 196 result = 0; |
197 for (i=0 ; i<13 ; i++) { | 197 for (i=0 ; i<13 ; i++) { |
198 result &= init_vlc (&q->envelope_quant_index[i], 9, 24, | 198 result |= init_vlc (&q->envelope_quant_index[i], 9, 24, |
199 envelope_quant_index_huffbits[i], 1, 1, | 199 envelope_quant_index_huffbits[i], 1, 1, |
200 envelope_quant_index_huffcodes[i], 2, 2, 0); | 200 envelope_quant_index_huffcodes[i], 2, 2, 0); |
201 } | 201 } |
202 av_log(NULL,AV_LOG_DEBUG,"sqvh VLC init\n"); | 202 av_log(NULL,AV_LOG_DEBUG,"sqvh VLC init\n"); |
203 for (i=0 ; i<7 ; i++) { | 203 for (i=0 ; i<7 ; i++) { |
204 result &= init_vlc (&q->sqvh[i], vhvlcsize_tab[i], vhsize_tab[i], | 204 result |= init_vlc (&q->sqvh[i], vhvlcsize_tab[i], vhsize_tab[i], |
205 cvh_huffbits[i], 1, 1, | 205 cvh_huffbits[i], 1, 1, |
206 cvh_huffcodes[i], 2, 2, 0); | 206 cvh_huffcodes[i], 2, 2, 0); |
207 } | 207 } |
208 | 208 |
209 if (q->nb_channels==2 && q->joint_stereo==1){ | 209 if (q->nb_channels==2 && q->joint_stereo==1){ |
210 result &= init_vlc (&q->ccpl, 6, (1<<q->js_vlc_bits)-1, | 210 result |= init_vlc (&q->ccpl, 6, (1<<q->js_vlc_bits)-1, |
211 ccpl_huffbits[q->js_vlc_bits-2], 1, 1, | 211 ccpl_huffbits[q->js_vlc_bits-2], 1, 1, |
212 ccpl_huffcodes[q->js_vlc_bits-2], 2, 2, 0); | 212 ccpl_huffcodes[q->js_vlc_bits-2], 2, 2, 0); |
213 av_log(NULL,AV_LOG_DEBUG,"Joint-stereo VLC used.\n"); | 213 av_log(NULL,AV_LOG_DEBUG,"Joint-stereo VLC used.\n"); |
214 } | 214 } |
215 | 215 |