git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
751883c
)
avcodec/vc1: Simplify dmv_y initialization
author
zhaoxiu.zeng
<zhaoxiu.zeng@gmail.com>
Tue, 24 Feb 2015 16:28:45 +0000
(
00:28
+0800)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 28 Feb 2015 13:52:57 +0000
(14:52 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vc1_block.c
patch
|
blob
|
history
diff --git
a/libavcodec/vc1_block.c
b/libavcodec/vc1_block.c
index
7433a88
..
206c6a7
100644
(file)
--- 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 {