* commit '3bfdee00cd92ff07c364d4901c4aefda32780756':
x86: dcadsp: Fix linking with yasm and optimizations disabled
Conflicts:
libavcodec/x86/dcadsp_init.c
See: 206167a295
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4.3 KiB
4.3 KiB