Commit f45fcba3 authored by Loren Merritt's avatar Loren Merritt

cosmetics (reduce nesting)

Originally committed as revision 9119 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent acc0e0c8
...@@ -329,10 +329,12 @@ static void generate_joint_tables(HYuvContext *s){ ...@@ -329,10 +329,12 @@ static void generate_joint_tables(HYuvContext *s){
for(i=y=0; y<256; y++){ for(i=y=0; y<256; y++){
int len0 = s->len[0][y]; int len0 = s->len[0][y];
int limit = VLC_BITS - len0; int limit = VLC_BITS - len0;
if(limit > 0){ if(limit <= 0)
continue;
for(u=0; u<256; u++){ for(u=0; u<256; u++){
int len1 = s->len[p][u]; int len1 = s->len[p][u];
if(len1 <= limit){ if(len1 > limit)
continue;
len[i] = len0 + len1; len[i] = len0 + len1;
bits[i] = (s->bits[0][y] << len1) + s->bits[p][u]; bits[i] = (s->bits[0][y] << len1) + s->bits[p][u];
symbols[i] = (y<<8) + u; symbols[i] = (y<<8) + u;
...@@ -340,8 +342,6 @@ static void generate_joint_tables(HYuvContext *s){ ...@@ -340,8 +342,6 @@ static void generate_joint_tables(HYuvContext *s){
i++; i++;
} }
} }
}
}
free_vlc(&s->vlc[3+p]); free_vlc(&s->vlc[3+p]);
init_vlc_sparse(&s->vlc[3+p], VLC_BITS, i, len, 1, 1, bits, 2, 2, symbols, 2, 2, 0); init_vlc_sparse(&s->vlc[3+p], VLC_BITS, i, len, 1, 1, bits, 2, 2, symbols, 2, 2, 0);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment