Revision d2975f8d libavcodec/h263.c

View differences:

libavcodec/h263.c
1860 1860
static inline void mpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n, int intra_dc, 
1861 1861
                               UINT8 *scan_table, PutBitContext *dc_pb, PutBitContext *ac_pb)
1862 1862
{
1863
    int last, i, last_non_zero, sign;
1864
    int code;
1863
    int i, last_non_zero;
1864
#if 0 //variables for the outcommented version
1865
    int code, sign, last;
1866
#endif
1865 1867
    const RLTable *rl;
1866 1868
    UINT32 *bits_tab;
1867 1869
    UINT8 *len_tab;
......
4250 4252

  
4251 4253
        if (s->scalability) {
4252 4254
            GetBitContext bak= *gb;
4253
            int dummy= s->hierachy_type= get_bits1(gb);
4254
            int ref_layer_id= get_bits(gb, 4);
4255
            int ref_layer_sampling_dir= get_bits1(gb);
4256
            int h_sampling_factor_n= get_bits(gb, 5);
4257
            int h_sampling_factor_m= get_bits(gb, 5);
4258
            int v_sampling_factor_n= get_bits(gb, 5);
4259
            int v_sampling_factor_m= get_bits(gb, 5);
4255
            int ref_layer_id;
4256
            int ref_layer_sampling_dir;
4257
            int h_sampling_factor_n;
4258
            int h_sampling_factor_m;
4259
            int v_sampling_factor_n;
4260
            int v_sampling_factor_m;
4261
            
4262
            s->hierachy_type= get_bits1(gb);
4263
            ref_layer_id= get_bits(gb, 4);
4264
            ref_layer_sampling_dir= get_bits1(gb);
4265
            h_sampling_factor_n= get_bits(gb, 5);
4266
            h_sampling_factor_m= get_bits(gb, 5);
4267
            v_sampling_factor_n= get_bits(gb, 5);
4268
            v_sampling_factor_m= get_bits(gb, 5);
4260 4269
            s->enhancement_type= get_bits1(gb);
4261 4270
            
4262 4271
            if(   h_sampling_factor_n==0 || h_sampling_factor_m==0 

Also available in: Unified diff