diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 13:38:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 13:38:38 +0100 |
| commit | 1dad4867146007486d6e84e59454734d1fc804c5 (patch) | |
| tree | 84d90dde2ff8ec5c8bec330aab43f05dd5025ade /libavcodec/libfdk-aacenc.c | |
| parent | 1c755f76676eeaebbeb8763390c679a9b735c334 (diff) | |
| parent | 9ce02e14f01de50fcc6f7f459544b140be66d615 (diff) | |
| download | ffmpeg-1dad4867146007486d6e84e59454734d1fc804c5.tar.gz | |
Merge commit '9ce02e14f01de50fcc6f7f459544b140be66d615'
* commit '9ce02e14f01de50fcc6f7f459544b140be66d615':
x86: ac3dsp: port to cpuflags
x86util: Add cpuflags_mmxext alias for cpuflags_mmx2
x86inc: Only define program_name if the macro is unset
Conflicts:
libavcodec/x86/ac3dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libfdk-aacenc.c')
0 files changed, 0 insertions, 0 deletions