Michael Niedermayer 5db23c07a3 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@gmx.at>

2014-09-03 03:19:40 +02:00

2.2 KiB

Raw Blame History

View Raw