[FFmpeg-cvslog] iavcodec/vc1dec: Fix missing {}
Michael Niedermayer
git at videolan.org
Wed Jun 25 17:01:35 CEST 2014
ffmpeg | branch: release/2.0 | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 16 02:06:37 2014 +0200| [4d9aad95b517057c0c341fd705f7b571def0fa4d] | committer: Michael Niedermayer
iavcodec/vc1dec: Fix missing {}
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit cb53beb81a5b9192c79de401f1e1e13fadddc429)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4d9aad95b517057c0c341fd705f7b571def0fa4d
---
libavcodec/vc1dec.c | 3 ++-
tests/ref/fate/vc1_sa10143 | 28 ++++++++++++++--------------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 88f3ca2..941a5a6 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -1909,9 +1909,10 @@ static void vc1_interp_mc(VC1Context *v)
uvmx = (mx + ((mx & 3) == 3)) >> 1;
uvmy = (my + ((my & 3) == 3)) >> 1;
if (v->field_mode) {
- if (v->cur_field_type != v->ref_field_type[1])
+ if (v->cur_field_type != v->ref_field_type[1]) {
my = my - 2 + 4 * v->cur_field_type;
uvmy = uvmy - 2 + 4 * v->cur_field_type;
+ }
}
if (v->fastuvmc) {
uvmx = uvmx + ((uvmx < 0) ? -(uvmx & 1) : (uvmx & 1));
diff --git a/tests/ref/fate/vc1_sa10143 b/tests/ref/fate/vc1_sa10143
index 6a5137f..c0ecc3b 100644
--- a/tests/ref/fate/vc1_sa10143
+++ b/tests/ref/fate/vc1_sa10143
@@ -1,31 +1,31 @@
#tb 0: 1/25
0, 0, 0, 1, 518400, 0x89407f55
-0, 2, 2, 1, 518400, 0x8611849c
+0, 2, 2, 1, 518400, 0xaa896afd
0, 3, 3, 1, 518400, 0x0e69ff59
-0, 4, 4, 1, 518400, 0xf31adb03
+0, 4, 4, 1, 518400, 0x0c30bfa0
0, 5, 5, 1, 518400, 0x1a5b6a69
-0, 6, 6, 1, 518400, 0x6ae6232e
+0, 6, 6, 1, 518400, 0x23470858
0, 7, 7, 1, 518400, 0x9a4e3c54
-0, 8, 8, 1, 518400, 0xe5852b45
+0, 8, 8, 1, 518400, 0xad63160b
0, 9, 9, 1, 518400, 0x0fcfeebc
-0, 10, 10, 1, 518400, 0x06e22dc3
+0, 10, 10, 1, 518400, 0x20b31777
0, 11, 11, 1, 518400, 0x9d79df09
-0, 12, 12, 1, 518400, 0xcb2c716f
+0, 12, 12, 1, 518400, 0x3e86766f
0, 13, 13, 1, 518400, 0x638a8746
-0, 14, 14, 1, 518400, 0xf7032efd
+0, 14, 14, 1, 518400, 0x7a6c1a0e
0, 15, 15, 1, 518400, 0x306f6cef
-0, 16, 16, 1, 518400, 0xe83d2518
+0, 16, 16, 1, 518400, 0x81f81281
0, 17, 17, 1, 518400, 0x49ab5bf5
-0, 18, 18, 1, 518400, 0x6b336b6f
+0, 18, 18, 1, 518400, 0x8f316e44
0, 19, 19, 1, 518400, 0x95ae00c9
-0, 20, 20, 1, 518400, 0x68ddb64f
+0, 20, 20, 1, 518400, 0xf71bb7f5
0, 21, 21, 1, 518400, 0x5205ea68
-0, 22, 22, 1, 518400, 0xb088e617
+0, 22, 22, 1, 518400, 0x74a1d8b9
0, 23, 23, 1, 518400, 0xa3217616
-0, 24, 24, 1, 518400, 0x1723bc53
+0, 24, 24, 1, 518400, 0x2b28bbf8
0, 25, 25, 1, 518400, 0xf024872a
-0, 26, 26, 1, 518400, 0x2e81a8bb
+0, 26, 26, 1, 518400, 0x2fdbaaf3
0, 27, 27, 1, 518400, 0xa3a2418e
-0, 28, 28, 1, 518400, 0xb7beffed
+0, 28, 28, 1, 518400, 0x55bfe435
0, 29, 29, 1, 518400, 0x50fb6c94
0, 30, 30, 1, 518400, 0x5584bb40
More information about the ffmpeg-cvslog
mailing list