Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Jul 2013 10:01:29 +0000 (12:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Jul 2013 10:01:29 +0000 (12:01 +0200)
commit7dec8512be12675e84213c744c1aa511bed4d057
treed4a24c9cd1eb9223e65ca658c4b2d916d79bca64
parentda0f67b177adaa3f792038bff174d015da1179a4
parent6fd221e5f8b0dcd33c249e553ea0be87778f2479
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  8bps: Make the bound-checks consistent

Conflicts:
libavcodec/8bps.c

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