* commit '3bfdee00':
  x86: dcadsp: Fix linking with yasm and optimizations disabled

Conflicts:
	libavcodec/x86/dcadsp_init.c

See: 206167a2Merged-by: Michael Niedermayer <michaelni@gmx.at>