diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-27 12:22:10 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-27 12:22:10 +0100 |
commit | cdb9752a0f96373e80bcee71d19515c6c5605f23 (patch) | |
tree | 98dba03c8082d746e638657ecdd943b03c97da21 /libavutil/intreadwrite.h | |
parent | 04ec796bda7919058d6a75cf11b9a387a207375a (diff) | |
parent | 845cfc92f908791714b8c4c8a49c91b8c64b685e (diff) | |
download | ffmpeg-cdb9752a0f96373e80bcee71d19515c6c5605f23.tar.gz |
Merge commit '845cfc92f908791714b8c4c8a49c91b8c64b685e'
* commit '845cfc92f908791714b8c4c8a49c91b8c64b685e':
x86: dsputil: Drop aliasing of ff_put_pixels8_mmx to ff_put_pixels8_mmxext
Conflicts:
libavcodec/x86/dsputil_mmx.c
Note, the commit message is wrong, there are no mmxext instructions as
claimed in the function. The change should do no harm though
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/intreadwrite.h')
0 files changed, 0 insertions, 0 deletions