Merge commit 'd2869aea0494d3a20d53d5034cd41dbb488eb133'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Jun 2014 01:05:10 +0000 (03:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Jun 2014 01:05:33 +0000 (03:05 +0200)
* commit 'd2869aea0494d3a20d53d5034cd41dbb488eb133':
  dsputil: Move MMX/SSE2-optimized IDCT bits to the x86 subdirectory

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/x86/dsputil_init.c

Simple merge
Simple merge
Simple merge