aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-31 14:08:49 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-10-31 14:08:49 +0100
commit4b874fc4fc2739db7a907ce430ac862e625b7387 (patch)
treef3e116c3be4782c51b3843daa06dcb754e24ce27 /libavutil
parent78ec407d5a7ed8a00d49e7555e2cc55e7786fd1d (diff)
parenta65bdceb060628881578afb29df4eb222421381f (diff)
downloadffmpeg-4b874fc4fc2739db7a907ce430ac862e625b7387.tar.gz
Merge commit 'a65bdceb060628881578afb29df4eb222421381f'
* commit 'a65bdceb060628881578afb29df4eb222421381f': x86: mmx2 ---> mmxext in variable names Conflicts: libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
0 files changed, 0 insertions, 0 deletions