aboutsummaryrefslogtreecommitdiffstats
path: root/doc/swscale.txt
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-14 12:01:13 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-14 12:12:20 +0200
commita887372109a262263ec04355d30f9834c35ac85f (patch)
treec10e27e8e346cc1b7a162887f018776436a519c0 /doc/swscale.txt
parentb2da63db507b88743edb6bf6675aaf4f9f59edb1 (diff)
parent1399931d07f0f37ef4526eb8d39d33c64e09618a (diff)
downloadffmpeg-a887372109a262263ec04355d30f9834c35ac85f.tar.gz
Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'
* commit '1399931d07f0f37ef4526eb8d39d33c64e09618a': x86: dsputil: Rename dsputil_mmx.h --> dsputil_x86.h Conflicts: libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/swscale.txt')
0 files changed, 0 insertions, 0 deletions