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