Commit bd55f01c authored by zhaoxiu.zeng's avatar zhaoxiu.zeng Committed by Michael Niedermayer

avcodec/vc1_block: Simplify dir_ptr / pred initialization

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent f6b195cf
...@@ -423,20 +423,12 @@ static inline int ff_vc1_pred_dc(MpegEncContext *s, int overlap, int pq, int n, ...@@ -423,20 +423,12 @@ static inline int ff_vc1_pred_dc(MpegEncContext *s, int overlap, int pq, int n,
b = (b * s->y_dc_scale_table[q2] * ff_vc1_dqscale[dqscale_index] + 0x20000) >> 18; b = (b * s->y_dc_scale_table[q2] * ff_vc1_dqscale[dqscale_index] + 0x20000) >> 18;
} }
if (a_avail && c_avail) { if (c_avail && (!a_avail || abs(a - b) <= abs(b - c))) {
if (abs(a - b) <= abs(b - c)) { pred = c;
pred = c; *dir_ptr = 1; // left
*dir_ptr = 1; // left
} else {
pred = a;
*dir_ptr = 0; // top
}
} else if (a_avail) { } else if (a_avail) {
pred = a; pred = a;
*dir_ptr = 0; // top *dir_ptr = 0; // top
} else if (c_avail) {
pred = c;
*dir_ptr = 1; // left
} else { } else {
pred = 0; pred = 0;
*dir_ptr = 1; // left *dir_ptr = 1; // left
......
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