From b5fe13448b13bfdd48a75b7e12387e11e3526d7c Mon Sep 17 00:00:00 2001
From: Tim Walker <tdskywalker@gmail.com>
Date: Thu, 25 Sep 2014 18:34:26 +0200
Subject: [PATCH] vc1: Use logical instead of bitwise or for coded_inter
This appears to be the intended behavior.
---
libavcodec/vc1dec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 8ad4f0f7de0..35245abef10 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -3676,7 +3676,7 @@ static int vc1_decode_p_mb(VC1Context *v)
vc1_mc_4mv_chroma(v, 0);
v->mb_type[0][s->block_index[i]] = is_intra[i];
if (!coded_inter)
- coded_inter = !is_intra[i] & is_coded[i];
+ coded_inter = !is_intra[i] && is_coded[i];
}
// if there are no coded blocks then don't do anything more
dst_idx = 0;
--
GitLab