Michael Niedermayer 5ba1648318 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>

2014-02-28 17:13:00 +01:00

2.0 KiB

Raw Blame History

View Raw