Merge commit 'b23650491fbd579a4365f42bd42575afb7b53f7e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 16:13:00 +0000 (17:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 16:13:00 +0000 (17:13 +0100)
commit5ba1648318161b394499a04e8fc7385ee2fbf375
tree19c4440ff815dcd4873464b182d803813c2aa0a7
parentf3eef02746ef9585400f58de7803c2db7efd7b4a
parentb23650491fbd579a4365f42bd42575afb7b53f7e
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>
libavcodec/proresdsp.c
libavcodec/proresdsp.h
libavcodec/x86/proresdsp_init.c