* qatar/master:
  cavs: Check for negative cbp

Conflicts:
	libavcodec/cavsdec.c

See: 9f06c1c6Merged-by: Michael Niedermayer <michaelni@gmx.at>