From fca435fee167da981f024e35d9fef4e6179b8061 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 4 Jun 2013 02:27:21 +0200 Subject: [PATCH] vc1dec: Disable dead code Fixes CID732197/6 A assert is added to check that the disabled code wont be needed in the future. Signed-off-by: Michael Niedermayer --- libavcodec/vc1dec.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index f29723cf68..912b9700f8 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -1843,21 +1843,23 @@ static inline void vc1_pred_mv_intfr(VC1Context *v, int n, int dmv_x, int dmv_y, } else if (!field_b && b_valid) { px = B[0]; py = B[1]; - } else if (c_valid) { + } else /*if (c_valid)*/ { + av_assert1(c_valid); px = C[0]; py = C[1]; - } else px = py = 0; + } /*else px = py = 0;*/ } else { if (field_a && a_valid) { px = A[0]; py = A[1]; - } else if (field_b && b_valid) { + } else /*if (field_b && b_valid)*/ { + av_assert1(field_b && b_valid); px = B[0]; py = B[1]; - } else if (c_valid) { + } /*else if (c_valid) { px = C[0]; py = C[1]; - } + }*/ } } else if (total_valid == 1) { px = (a_valid) ? A[0] : ((b_valid) ? B[0] : C[0]);