diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-14 10:55:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-14 11:19:20 +0200 |
| commit | b2da63db507b88743edb6bf6675aaf4f9f59edb1 (patch) | |
| tree | 884dab6eb19148f89956b41c5f8b4b364bae5547 /libavcodec/imgconvert.c | |
| parent | eda9d97b7a1dcebc6684f88e4f6472e18bd6b9f0 (diff) | |
| parent | 245b76a108585b6fb52eebc2626c472d6fa530dc (diff) | |
| download | ffmpeg-b2da63db507b88743edb6bf6675aaf4f9f59edb1.tar.gz | |
Merge commit '245b76a108585b6fb52eebc2626c472d6fa530dc'
* commit '245b76a108585b6fb52eebc2626c472d6fa530dc':
x86: dsputil: Split inline assembly from init code
Conflicts:
libavcodec/x86/dsputil_mmx.c
Note, the author attribution is left in place and not removed
as it is in the merged commit.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/imgconvert.c')
0 files changed, 0 insertions, 0 deletions