avoid duplication of size_table and offset_table
Originally committed as revision 16743 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
		
							parent
							
								
									fa79489fd3
								
							
						
					
					
						commit
						3e7233688a
					
				@ -3103,6 +3103,8 @@ static int vc1_decode_p_block(VC1Context *v, DCTELEM block[64], int n, int mquan
 | 
			
		||||
    return pat;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static const int size_table  [6] = { 0, 2, 3, 4,  5,  8 };
 | 
			
		||||
static const int offset_table[6] = { 0, 1, 3, 7, 15, 31 };
 | 
			
		||||
 | 
			
		||||
/** Decode one P-frame MB (in Simple/Main profile)
 | 
			
		||||
 */
 | 
			
		||||
@ -3116,8 +3118,6 @@ static int vc1_decode_p_mb(VC1Context *v)
 | 
			
		||||
    int mqdiff, mquant; /* MB quantization */
 | 
			
		||||
    int ttmb = v->ttfrm; /* MB Transform type */
 | 
			
		||||
 | 
			
		||||
    static const int size_table[6] = { 0, 2, 3, 4, 5, 8 },
 | 
			
		||||
      offset_table[6] = { 0, 1, 3, 7, 15, 31 };
 | 
			
		||||
    int mb_has_coeffs = 1; /* last_flag */
 | 
			
		||||
    int dmv_x, dmv_y; /* Differential MV components */
 | 
			
		||||
    int index, index1; /* LUT indexes */
 | 
			
		||||
@ -3411,9 +3411,6 @@ static void vc1_decode_b_mb(VC1Context *v)
 | 
			
		||||
    int cbp = 0; /* cbp decoding stuff */
 | 
			
		||||
    int mqdiff, mquant; /* MB quantization */
 | 
			
		||||
    int ttmb = v->ttfrm; /* MB Transform type */
 | 
			
		||||
 | 
			
		||||
    static const int size_table[6] = { 0, 2, 3, 4, 5, 8 },
 | 
			
		||||
      offset_table[6] = { 0, 1, 3, 7, 15, 31 };
 | 
			
		||||
    int mb_has_coeffs = 0; /* last_flag */
 | 
			
		||||
    int index, index1; /* LUT indexes */
 | 
			
		||||
    int val, sign; /* temp values */
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user