aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/x86/dsputil_mmx.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-28 17:13:00 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-02-28 17:13:00 +0100
commit5ba1648318161b394499a04e8fc7385ee2fbf375 (patch)
tree19c4440ff815dcd4873464b182d803813c2aa0a7 /libavcodec/x86/dsputil_mmx.c
parentf3eef02746ef9585400f58de7803c2db7efd7b4a (diff)
parentb23650491fbd579a4365f42bd42575afb7b53f7e (diff)
downloadffmpeg-5ba1648318161b394499a04e8fc7385ee2fbf375.tar.gz
Merge commit 'b23650491fbd579a4365f42bd42575afb7b53f7e'
* commit 'b23650491fbd579a4365f42bd42575afb7b53f7e': prores: Use consistent names for DSP arch initialization functions Conflicts: libavcodec/proresdsp.c libavcodec/proresdsp.h libavcodec/x86/proresdsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dsputil_mmx.c')
0 files changed, 0 insertions, 0 deletions