diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 19:34:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 19:34:04 +0100 |
| commit | 8528feb13cd320716478a5033919cb7656b41863 (patch) | |
| tree | d045e7816f00d2f2377f17f9cbde0372f591a056 /libavformat | |
| parent | 2e57d4ba24b1c7806375ef05a56c3627a97d21db (diff) | |
| parent | d2f4846591727fedcc2b452b688da8da09ee8305 (diff) | |
| download | ffmpeg-8528feb13cd320716478a5033919cb7656b41863.tar.gz | |
Merge commit 'd2f4846591727fedcc2b452b688da8da09ee8305' into release/0.10
* 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>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions