RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix logic for return value of init_vlc 

Originally committed as revision 8954 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ramiro Polla 2007-05-09 21:50:01 +00:00
parent 5880d5b58d
commit cdb59552df
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/cook.c
View File

@ -195,19 +195,19 @@ static int init_cook_vlc_tables(COOKContext *q) {
result = 0; result = 0;
for (i=0 ; i<13 ; i++) { 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_huffbits[i], 1, 1,
envelope_quant_index_huffcodes[i], 2, 2, 0); envelope_quant_index_huffcodes[i], 2, 2, 0);
} }
av_log(NULL,AV_LOG_DEBUG,"sqvh VLC init\n"); av_log(NULL,AV_LOG_DEBUG,"sqvh VLC init\n");
for (i=0 ; i<7 ; i++) { 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_huffbits[i], 1, 1,
cvh_huffcodes[i], 2, 2, 0); cvh_huffcodes[i], 2, 2, 0);
} }
if (q->nb_channels==2 && q->joint_stereo==1){ 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_huffbits[q->js_vlc_bits-2], 1, 1,
ccpl_huffcodes[q->js_vlc_bits-2], 2, 2, 0); ccpl_huffcodes[q->js_vlc_bits-2], 2, 2, 0);
av_log(NULL,AV_LOG_DEBUG,"Joint-stereo VLC used.\n"); av_log(NULL,AV_LOG_DEBUG,"Joint-stereo VLC used.\n");