diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-26 20:47:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-26 20:47:43 +0200 |
| commit | bde8eb7fa33d16cbba0705a18205df4257351e22 (patch) | |
| tree | 2ca33c5ba00b2291e05547438b2fff9fe27de81a /libavcodec | |
| parent | 1964251be7df69122108df89fb619f9a71bfb23f (diff) | |
| parent | b5fe13448b13bfdd48a75b7e12387e11e3526d7c (diff) | |
| download | ffmpeg-bde8eb7fa33d16cbba0705a18205df4257351e22.tar.gz | |
Merge commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c'
* commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c':
vc1: Use logical instead of bitwise or for coded_inter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 a25c3d955c..72c8327554 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -3673,7 +3673,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; |