[FFmpeg-cvslog] Merge commit '4dc0fbb13c33b4e5bdb766652f4daf900ccc952f' into release/2.4

Michael Niedermayer git at videolan.org
Fri May 29 00:02:06 CEST 2015


ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Thu May 28 22:40:35 2015 +0200| [95cf5e83a750fb886eb8c509e0f907eabda96d1a] | committer: Michael Niedermayer

Merge commit '4dc0fbb13c33b4e5bdb766652f4daf900ccc952f' into release/2.4

* commit '4dc0fbb13c33b4e5bdb766652f4daf900ccc952f':
  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=95cf5e83a750fb886eb8c509e0f907eabda96d1a
---





More information about the ffmpeg-cvslog mailing list