* commit 'f8c17197':
  dca: Remove separate header for DCA ExSS

Conflicts:
	libavcodec/dca.h
	libavcodec/dca_exss.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>