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)
* commit '57b5b84e208ad61ffdd74ad849bed212deb92bc5':
  x86: dsputil: Move ff_apply_window_int16_* bits to ac3dsp, where they belong

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

Simple merge
Simple merge