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)
commitbde8eb7fa33d16cbba0705a18205df4257351e22
tree2ca33c5ba00b2291e05547438b2fff9fe27de81a
parent1964251be7df69122108df89fb619f9a71bfb23f
parentb5fe13448b13bfdd48a75b7e12387e11e3526d7c
Merge commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c'

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

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