aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/avstring.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-14 10:55:28 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-14 11:19:20 +0200
commitb2da63db507b88743edb6bf6675aaf4f9f59edb1 (patch)
tree884dab6eb19148f89956b41c5f8b4b364bae5547 /libavutil/avstring.h
parenteda9d97b7a1dcebc6684f88e4f6472e18bd6b9f0 (diff)
parent245b76a108585b6fb52eebc2626c472d6fa530dc (diff)
downloadffmpeg-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 'libavutil/avstring.h')
0 files changed, 0 insertions, 0 deletions