* commit '4736d003':
  cavsdec: check ff_get_buffer() return value

Conflicts:
	libavcodec/cavsdec.c

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