aboutsummaryrefslogtreecommitdiffstats
path: root/libavresample/audio_mix_matrix.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-14 12:34:30 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-14 12:34:30 +0100
commita1b5c9634e87160251fd41635beb01da157cf00c (patch)
treea62b214125e71d0f6a0a7ce910100a3641cc010e /libavresample/audio_mix_matrix.c
parentb0c543b1deba77647911be159b013760b5d05db3 (diff)
parent26301caaa1aec5d71b564bff452147d6183370bf (diff)
downloadffmpeg-a1b5c9634e87160251fd41635beb01da157cf00c.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: x86: mmx2 ---> mmxext in asm constructs Conflicts: libavcodec/x86/h264_chromamc_10bit.asm libavcodec/x86/h264_deblock.asm libavcodec/x86/h264dsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/audio_mix_matrix.c')
0 files changed, 0 insertions, 0 deletions