Merge commit 'd2f4846591727fedcc2b452b688da8da09ee8305' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 18:34:04 +0000 (19:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 18:34:04 +0000 (19:34 +0100)
* commit 'd2f4846591727fedcc2b452b688da8da09ee8305':
  Prepare for 0.8.7 Release
  x86: fft: Remove 3DNow! optimizations, they break FATE
  x86: ac3dsp: Drop mmx variant of ac3_max_msb_abs_int16

Conflicts:
RELEASE
libavcodec/x86/fft_3dn.c
libavcodec/x86/fft_3dn2.c

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

Simple merge
Simple merge
Simple merge
Simple merge