Merge commit '84d173d3de97c753234ab0c0b50551d51413d663'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 20:00:29 +0000 (22:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 20:17:04 +0000 (22:17 +0200)
commit0dcebb9f6345ecc7fa2f184c48cc5a21a3011b93
tree622bc82f4a5edf8660edd85e36827f1614214eed
parent5ff2b33401ec0ac6a238d02e56100b7bce8afefe
parent84d173d3de97c753234ab0c0b50551d51413d663
Merge commit '84d173d3de97c753234ab0c0b50551d51413d663'

* commit '84d173d3de97c753234ab0c0b50551d51413d663':
  xvididct: Ensure that the scantable permutation is always set correctly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/idctdsp_init.c
libavcodec/x86/xvididct_init.c
libavcodec/xvididct.c