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)
* commit '84d173d3de97c753234ab0c0b50551d51413d663':
  xvididct: Ensure that the scantable permutation is always set correctly

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

Simple merge
Simple merge
Simple merge