Merge commit 'adff0a81'
* commit 'adff0a81': arm: dsputil: Coalesce all init files Conflicts: libavcodec/arm/Makefile libavcodec/arm/dsputil_arm.h libavcodec/arm/dsputil_init_arm.c libavcodec/arm/dsputil_init_armv6.c Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment