mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-03-08 22:39:44 +02:00
* commit 'e4610300de6869bd6b3b00e76cfeabb6d7653dcd': x86: cavs: Remove an unneeded scratch buffer Conflicts: libavcodec/x86/cavsdsp.c See: d79f7bf0d63a81ee66026ee92a6946a7303d04bd Merged-by: Michael Niedermayer <michaelni@gmx.at>