|
|
|
@@ -401,7 +401,6 @@ static inline int get_block_rate(MpegEncContext * s, DCTELEM block[64], int bloc |
|
|
|
else rate+= s->intra_ac_vlc_last_length[UNI_AC_ENC_INDEX(j-last-1, level)]; |
|
|
|
}else |
|
|
|
rate += s->ac_esc_length; |
|
|
|
level-= 64; |
|
|
|
|
|
|
|
last= j; |
|
|
|
} |
|
|
|
@@ -1552,7 +1551,7 @@ void ff_h263_loop_filter(MpegEncContext * s){ |
|
|
|
#if CONFIG_ENCODERS |
|
|
|
static int h263_pred_dc(MpegEncContext * s, int n, int16_t **dc_val_ptr) |
|
|
|
{ |
|
|
|
int x, y, wrap, a, c, pred_dc, scale; |
|
|
|
int x, y, wrap, a, c, pred_dc; |
|
|
|
int16_t *dc_val; |
|
|
|
|
|
|
|
/* find prediction */ |
|
|
|
@@ -1561,13 +1560,11 @@ static int h263_pred_dc(MpegEncContext * s, int n, int16_t **dc_val_ptr) |
|
|
|
y = 2 * s->mb_y + ((n & 2) >> 1); |
|
|
|
wrap = s->b8_stride; |
|
|
|
dc_val = s->dc_val[0]; |
|
|
|
scale = s->y_dc_scale; |
|
|
|
} else { |
|
|
|
x = s->mb_x; |
|
|
|
y = s->mb_y; |
|
|
|
wrap = s->mb_stride; |
|
|
|
dc_val = s->dc_val[n - 4 + 1]; |
|
|
|
scale = s->c_dc_scale; |
|
|
|
} |
|
|
|
/* B C |
|
|
|
* A X |
|
|
|
@@ -1589,7 +1586,6 @@ static int h263_pred_dc(MpegEncContext * s, int n, int16_t **dc_val_ptr) |
|
|
|
pred_dc = c; |
|
|
|
|
|
|
|
/* we assume pred is positive */ |
|
|
|
//pred_dc = (pred_dc + (scale >> 1)) / scale; |
|
|
|
*dc_val_ptr = &dc_val[x + y * wrap]; |
|
|
|
return pred_dc; |
|
|
|
} |
|
|
|
|