Merge commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Sep 2014 18:47:11 +0000 (20:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Sep 2014 18:47:43 +0000 (20:47 +0200)
* commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c':
  vc1: Use logical instead of bitwise or for coded_inter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/vc1dec.c

Simple merge