diff options
| author | zhaoxiu.zeng <zhaoxiu.zeng@gmail.com> | 2015-02-25 00:28:45 +0800 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-28 15:09:57 +0100 |
| commit | bd55f01c96b4a8e6dd01d2e8478d24f353550426 (patch) | |
| tree | 70a87d1b505d4d95fe2c032e4b0b5ed22d285385 | |
| parent | f6b195cfb9712ae5032881d5dd8c4effb26be0fb (diff) | |
| download | ffmpeg-bd55f01c96b4a8e6dd01d2e8478d24f353550426.tar.gz | |
avcodec/vc1_block: Simplify dir_ptr / pred initialization
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/vc1_block.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index a681034987..7f65744849 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -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; } - if (a_avail && c_avail) { - if (abs(a - b) <= abs(b - c)) { - pred = c; - *dir_ptr = 1; // left - } else { - pred = a; - *dir_ptr = 0; // top - } + if (c_avail && (!a_avail || abs(a - b) <= abs(b - c))) { + pred = c; + *dir_ptr = 1; // left } else if (a_avail) { pred = a; *dir_ptr = 0; // top - } else if (c_avail) { - pred = c; - *dir_ptr = 1; // left } else { pred = 0; *dir_ptr = 1; // left |