diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2007-05-09 21:50:01 +0000 |
|---|---|---|
| committer | Ramiro Polla <ramiro.polla@gmail.com> | 2007-05-09 21:50:01 +0000 |
| commit | cdb59552df0b68ce1a0eb96545963ebc45d15eba (patch) | |
| tree | 8fff111138c3e95032ebf3b559f9732b013528ae /libavcodec | |
| parent | 5880d5b58dd273c48274895b40a4faa83de7ea6f (diff) | |
| download | ffmpeg-cdb59552df0b68ce1a0eb96545963ebc45d15eba.tar.gz | |
Fix logic for return value of init_vlc
Originally committed as revision 8954 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/cook.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/cook.c b/libavcodec/cook.c index cdbddea4f1..50a56723c0 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -195,19 +195,19 @@ static int init_cook_vlc_tables(COOKContext *q) { result = 0; for (i=0 ; i<13 ; i++) { - result &= init_vlc (&q->envelope_quant_index[i], 9, 24, + result |= init_vlc (&q->envelope_quant_index[i], 9, 24, envelope_quant_index_huffbits[i], 1, 1, envelope_quant_index_huffcodes[i], 2, 2, 0); } av_log(NULL,AV_LOG_DEBUG,"sqvh VLC init\n"); for (i=0 ; i<7 ; i++) { - result &= init_vlc (&q->sqvh[i], vhvlcsize_tab[i], vhsize_tab[i], + result |= init_vlc (&q->sqvh[i], vhvlcsize_tab[i], vhsize_tab[i], cvh_huffbits[i], 1, 1, cvh_huffcodes[i], 2, 2, 0); } if (q->nb_channels==2 && q->joint_stereo==1){ - result &= init_vlc (&q->ccpl, 6, (1<<q->js_vlc_bits)-1, + result |= init_vlc (&q->ccpl, 6, (1<<q->js_vlc_bits)-1, ccpl_huffbits[q->js_vlc_bits-2], 1, 1, ccpl_huffcodes[q->js_vlc_bits-2], 2, 2, 0); av_log(NULL,AV_LOG_DEBUG,"Joint-stereo VLC used.\n"); |