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)
commit810eb285e38dac89a0c04a87f1c8ce17a8bec770
tree1bd0e652325726bffa60556460f484e389ebf331
parent2e88f82a8a50b21a3273785ac1349fd94c1a8aa0
parenta55546f48d55e3d1155840541b2be5f4f8cf18ab
Merge commit 'a55546f48d55e3d1155840541b2be5f4f8cf18ab'

* commit 'a55546f48d55e3d1155840541b2be5f4f8cf18ab':
  proresenc: Reuse proper dsputil infrastructure for FDCT

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