Commit d2975f8d authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

warning fixes

Originally committed as revision 1044 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent ac2830ec
...@@ -1512,7 +1512,7 @@ void clear_blocks_c(DCTELEM *blocks) ...@@ -1512,7 +1512,7 @@ void clear_blocks_c(DCTELEM *blocks)
void dsputil_init(void) void dsputil_init(void)
{ {
int i, j; int i;
for(i=0;i<256;i++) cropTbl[i + MAX_NEG_CROP] = i; for(i=0;i<256;i++) cropTbl[i + MAX_NEG_CROP] = i;
for(i=0;i<MAX_NEG_CROP;i++) { for(i=0;i<MAX_NEG_CROP;i++) {
......
...@@ -1860,8 +1860,10 @@ static inline void mpeg4_encode_dc(PutBitContext * s, int level, int n) ...@@ -1860,8 +1860,10 @@ static inline void mpeg4_encode_dc(PutBitContext * s, int level, int n)
static inline void mpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n, int intra_dc, static inline void mpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n, int intra_dc,
UINT8 *scan_table, PutBitContext *dc_pb, PutBitContext *ac_pb) UINT8 *scan_table, PutBitContext *dc_pb, PutBitContext *ac_pb)
{ {
int last, i, last_non_zero, sign; int i, last_non_zero;
int code; #if 0 //variables for the outcommented version
int code, sign, last;
#endif
const RLTable *rl; const RLTable *rl;
UINT32 *bits_tab; UINT32 *bits_tab;
UINT8 *len_tab; UINT8 *len_tab;
...@@ -4250,13 +4252,20 @@ static int decode_vol_header(MpegEncContext *s, GetBitContext *gb){ ...@@ -4250,13 +4252,20 @@ static int decode_vol_header(MpegEncContext *s, GetBitContext *gb){
if (s->scalability) { if (s->scalability) {
GetBitContext bak= *gb; GetBitContext bak= *gb;
int dummy= s->hierachy_type= get_bits1(gb); int ref_layer_id;
int ref_layer_id= get_bits(gb, 4); int ref_layer_sampling_dir;
int ref_layer_sampling_dir= get_bits1(gb); int h_sampling_factor_n;
int h_sampling_factor_n= get_bits(gb, 5); int h_sampling_factor_m;
int h_sampling_factor_m= get_bits(gb, 5); int v_sampling_factor_n;
int v_sampling_factor_n= get_bits(gb, 5); int v_sampling_factor_m;
int v_sampling_factor_m= get_bits(gb, 5);
s->hierachy_type= get_bits1(gb);
ref_layer_id= get_bits(gb, 4);
ref_layer_sampling_dir= get_bits1(gb);
h_sampling_factor_n= get_bits(gb, 5);
h_sampling_factor_m= get_bits(gb, 5);
v_sampling_factor_n= get_bits(gb, 5);
v_sampling_factor_m= get_bits(gb, 5);
s->enhancement_type= get_bits1(gb); s->enhancement_type= get_bits1(gb);
if( h_sampling_factor_n==0 || h_sampling_factor_m==0 if( h_sampling_factor_n==0 || h_sampling_factor_m==0
......
...@@ -698,7 +698,7 @@ static inline int get_qscale(MpegEncContext *s) ...@@ -698,7 +698,7 @@ static inline int get_qscale(MpegEncContext *s)
static int mpeg_decode_mb(MpegEncContext *s, static int mpeg_decode_mb(MpegEncContext *s,
DCTELEM block[6][64]) DCTELEM block[6][64])
{ {
int i, j, k, cbp, val, code, mb_type, motion_type; int i, j, k, cbp, val, mb_type, motion_type;
dprintf("decode_mb: x=%d y=%d\n", s->mb_x, s->mb_y); dprintf("decode_mb: x=%d y=%d\n", s->mb_x, s->mb_y);
......
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