ffmpeg | branch: master | zhaoxiu.zeng <zhaoxiu.z...@gmail.com> | Wed Feb 25 00:28:45 2015 +0800| [bd55f01c96b4a8e6dd01d2e8478d24f353550426] | committer: Michael Niedermayer
avcodec/vc1_block: Simplify dir_ptr / pred initialization Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd55f01c96b4a8e6dd01d2e8478d24f353550426 --- libavcodec/vc1_block.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index a681034..7f65744 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 _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
