[FFmpeg-cvslog] Merge commit 'e4610300de6869bd6b3b00e76cfeabb6d7653dcd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 28 22:11:42 2015 +0200| [b666e81c132901d370b5645562826ecbcfce0b7a] | committer: Michael Niedermayer

Merge commit 'e4610300de6869bd6b3b00e76cfeabb6d7653dcd'

* commit 'e4610300de6869bd6b3b00e76cfeabb6d7653dcd':
  x86: cavs: Remove an unneeded scratch buffer

Conflicts:
	libavcodec/x86/cavsdsp.c

See: d79f7bf0d63a81ee66026ee92a6946a7303d04bd
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b666e81c132901d370b5645562826ecbcfce0b7a
---