* commit '4dc0fbb1':
  x86: cavs: Remove an unneeded scratch buffer

Conflicts:
	libavcodec/x86/cavsdsp.c

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