Merge commit '57b5b84e208ad61ffdd74ad849bed212deb92bc5'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Apr 2014 17:36:07 +0000 (19:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Apr 2014 17:36:21 +0000 (19:36 +0200)
commite6f69b324e88794c7a2874e5ee8398b3ac41b10c
tree0b30e5a9cf043b8a466983efeb4061a21719e944
parente3c3f277a9db88ad00ed94c6f6b0cf837bdd8cb0
parent57b5b84e208ad61ffdd74ad849bed212deb92bc5
Merge commit '57b5b84e208ad61ffdd74ad849bed212deb92bc5'

* commit '57b5b84e208ad61ffdd74ad849bed212deb92bc5':
  x86: dsputil: Move ff_apply_window_int16_* bits to ac3dsp, where they belong

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/ac3dsp.asm
libavcodec/x86/dsputil.asm