vc1: Use logical instead of bitwise or for coded_inter
authorTim Walker <tdskywalker@gmail.com>
Thu, 25 Sep 2014 16:34:26 +0000 (18:34 +0200)
committerTim Walker <tdskywalker@gmail.com>
Fri, 26 Sep 2014 14:18:42 +0000 (16:18 +0200)
This appears to be the intended behavior.

libavcodec/vc1dec.c

index 8ad4f0f..35245ab 100644 (file)
@@ -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;