[FFmpeg-cvslog] Merge commit '95c0cec03acec0a80cc1c7db48f3b2355d9e767b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep  3 03:18:07 2014 +0200| [5db23c07a3f76d31e8e3178f8bacb68289bba62b] | committer: Michael Niedermayer

Merge commit '95c0cec03acec0a80cc1c7db48f3b2355d9e767b'

* commit '95c0cec03acec0a80cc1c7db48f3b2355d9e767b':
  idctdsp: Add global function pointers for {add|put}_pixels_clamped functions

Conflicts:
	libavcodec/arm/idctdsp_init_arm.c
	libavcodec/dct.h
	libavcodec/idctdsp.c
	libavcodec/jrevdct.c

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

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