Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Oct 2013 08:17:47 +0000 (10:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Oct 2013 08:18:36 +0000 (10:18 +0200)
commit8d9f08ef32f15678375847c4c21d208f8e9d1ebc
tree4cb5cec336609382d6f5b719bcc6aaff951bbb01
parentd794b7db1453ada81c49ae03e777250b5c2868c6
parent39185ec4faa9ef33954dbf2394444e045b632673
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cavs: Check for negative cbp

Conflicts:
libavcodec/cavsdec.c

See: 9f06c1c61e876e930753da200bfe835817e30a53
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/cavsdec.c