* commit 'e4610300de6869bd6b3b00e76cfeabb6d7653dcd': x86: cavs: Remove an unneeded scratch buffer Conflicts: libavcodec/x86/cavsdsp.c See: d79f7bf0d6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
d79f7bf0d6