Merge commit '95c0cec03acec0a80cc1c7db48f3b2355d9e767b'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Sep 2014 01:18:07 +0000 (03:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Sep 2014 01:19:40 +0000 (03:19 +0200)
commit5db23c07a3f76d31e8e3178f8bacb68289bba62b
treee798d3c254a0cc5a38b7e5f78864326919516602
parent9e59a7be1cc9bd840d91f78c55b7f4953659319b
parent95c0cec03acec0a80cc1c7db48f3b2355d9e767b
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>
libavcodec/arm/idctdsp_init_arm.c
libavcodec/dct.h
libavcodec/idctdsp.c
libavcodec/idctdsp.h
libavcodec/jrevdct.c
libavcodec/x86/simple_idct.c