mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-19 05:49:09 +02:00
5ba1648318
* 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>