|
|
|
@@ -411,12 +411,12 @@ static inline int ff_vc1_pred_dc(MpegEncContext *s, int overlap, int pq, int n, |
|
|
|
if (c_avail && (n != 1 && n != 3)) { |
|
|
|
q2 = s->current_picture.qscale_table[mb_pos - 1]; |
|
|
|
if (q2 && q2 != q1) |
|
|
|
c = (c * s->y_dc_scale_table[q2] * ff_vc1_dqscale[dqscale_index] + 0x20000) >> 18; |
|
|
|
c = (int)((unsigned)c * s->y_dc_scale_table[q2] * ff_vc1_dqscale[dqscale_index] + 0x20000) >> 18; |
|
|
|
} |
|
|
|
if (a_avail && (n != 2 && n != 3)) { |
|
|
|
q2 = s->current_picture.qscale_table[mb_pos - s->mb_stride]; |
|
|
|
if (q2 && q2 != q1) |
|
|
|
a = (a * s->y_dc_scale_table[q2] * ff_vc1_dqscale[dqscale_index] + 0x20000) >> 18; |
|
|
|
a = (int)((unsigned)a * s->y_dc_scale_table[q2] * ff_vc1_dqscale[dqscale_index] + 0x20000) >> 18; |
|
|
|
} |
|
|
|
if (a_avail && c_avail && (n != 3)) { |
|
|
|
int off = mb_pos; |
|
|
|
@@ -426,7 +426,7 @@ static inline int ff_vc1_pred_dc(MpegEncContext *s, int overlap, int pq, int n, |
|
|
|
off -= s->mb_stride; |
|
|
|
q2 = s->current_picture.qscale_table[off]; |
|
|
|
if (q2 && q2 != q1) |
|
|
|
b = (b * s->y_dc_scale_table[q2] * ff_vc1_dqscale[dqscale_index] + 0x20000) >> 18; |
|
|
|
b = (int)((unsigned)b * s->y_dc_scale_table[q2] * ff_vc1_dqscale[dqscale_index] + 0x20000) >> 18; |
|
|
|
} |
|
|
|
|
|
|
|
if (c_avail && (!a_avail || abs(a - b) <= abs(b - c))) { |
|
|
|
|