Mercurial > libavcodec.hg

comparison h263.c @ 751:cbe316f082bc libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
warning fixes
author michaelni
date Tue, 15 Oct 2002 15:24:08 +0000
parents 3d4377531f6c
children 8e1f0939d15d
comparison
equal deleted inserted replaced
750:4adadf210b3b 751:cbe316f082bc
1858 } 1858 }
1859 1859
1860 static inline void mpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n, int intra_dc, 1860 static inline void mpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n, int intra_dc,
1861 UINT8 *scan_table, PutBitContext *dc_pb, PutBitContext *ac_pb) 1861 UINT8 *scan_table, PutBitContext *dc_pb, PutBitContext *ac_pb)
1862 { 1862 {
1863 int last, i, last_non_zero, sign; 1863 int i, last_non_zero;
1864 int code; 1864 #if 0 //variables for the outcommented version
1865 int code, sign, last;
1866 #endif
1865 const RLTable *rl; 1867 const RLTable *rl;
1866 UINT32 *bits_tab; 1868 UINT32 *bits_tab;
1867 UINT8 *len_tab; 1869 UINT8 *len_tab;
1868 const int last_index = s->block_last_index[n]; 1870 const int last_index = s->block_last_index[n];
1869 1871
4248 4250
4249 s->scalability= get_bits1(gb); 4251 s->scalability= get_bits1(gb);
4250 4252
4251 if (s->scalability) { 4253 if (s->scalability) {
4252 GetBitContext bak= *gb; 4254 GetBitContext bak= *gb;
4253 int dummy= s->hierachy_type= get_bits1(gb); 4255 int ref_layer_id;
4254 int ref_layer_id= get_bits(gb, 4); 4256 int ref_layer_sampling_dir;
4255 int ref_layer_sampling_dir= get_bits1(gb); 4257 int h_sampling_factor_n;
4256 int h_sampling_factor_n= get_bits(gb, 5); 4258 int h_sampling_factor_m;
4257 int h_sampling_factor_m= get_bits(gb, 5); 4259 int v_sampling_factor_n;
4258 int v_sampling_factor_n= get_bits(gb, 5); 4260 int v_sampling_factor_m;
4259 int v_sampling_factor_m= get_bits(gb, 5); 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 s->enhancement_type= get_bits1(gb); 4269 s->enhancement_type= get_bits1(gb);
4261 4270
4262 if( h_sampling_factor_n==0 || h_sampling_factor_m==0 4271 if( h_sampling_factor_n==0 || h_sampling_factor_m==0
4263 || v_sampling_factor_n==0 || v_sampling_factor_m==0){ 4272 || v_sampling_factor_n==0 || v_sampling_factor_m==0){
4264 4273