diff options
author | Tim Walker <tdskywalker@gmail.com> | 2014-09-25 18:34:26 +0200 |
---|---|---|
committer | Tim Walker <tdskywalker@gmail.com> | 2014-09-26 16:18:42 +0200 |
commit | b5fe13448b13bfdd48a75b7e12387e11e3526d7c (patch) | |
tree | c6cc8e008075b6222e7201b2ab65d40087cc9bf8 /libavcodec | |
parent | b97f6ef956293fe06ae1e99bd295f42613081f37 (diff) | |
download | ffmpeg-b5fe13448b13bfdd48a75b7e12387e11e3526d7c.tar.gz |
vc1: Use logical instead of bitwise or for coded_inter
This appears to be the intended behavior.
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/vc1dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 8ad4f0f7de..35245abef1 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; |