RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 01:02:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c'

Browse Source 
* commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c':
  vc1: Use logical instead of bitwise or for coded_inter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-09-26 20:47:11 +02:00
commit bde8eb7fa3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/vc1dec.c
View File

@ -3673,7 +3673,7 @@ static int vc1_decode_p_mb(VC1Context *v)
vc1_mc_4mv_chroma(v, 0); vc1_mc_4mv_chroma(v, 0);
v->mb_type[0][s->block_index[i]] = is_intra[i]; v->mb_type[0][s->block_index[i]] = is_intra[i];
if (!coded_inter) 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 // if there are no coded blocks then don't do anything more
dst_idx = 0; dst_idx = 0;