Merge commit 'a55546f48d55e3d1155840541b2be5f4f8cf18ab'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 17:05:13 +0000 (18:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 17:06:12 +0000 (18:06 +0100)
* commit 'a55546f48d55e3d1155840541b2be5f4f8cf18ab':
  proresenc: Reuse proper dsputil infrastructure for FDCT

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/proresenc_kostya.c

Simple merge