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 14:52:57 +0100 |
| commit | d8e030c3ccd3e4ce3027895504d591954e6efecc (patch) | |
| tree | 03bc47effbe52f5088f41c2ad71d9a17cfc56fa6 | |
| parent | 751883c602e6dab0523f0aa4bd45ab8c83f0ed1e (diff) | |
avcodec/vc1: Simplify dmv_y initialization
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/vc1_block.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index 7433a886c7..206c6a714d 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -259,12 +259,9 @@ static av_always_inline void get_mvdata_interlaced(VC1Context *v, int *dmv_x, *dmv_x = get_bits(gb, v->k_x); *dmv_y = get_bits(gb, v->k_y); if (v->numref) { - if (pred_flag) { + if (pred_flag) *pred_flag = *dmv_y & 1; - *dmv_y = (*dmv_y + *pred_flag) >> 1; - } else { - *dmv_y = (*dmv_y + (*dmv_y & 1)) >> 1; - } + *dmv_y = (*dmv_y + (*dmv_y & 1)) >> 1; } } else { |