* commit '25f613f8':
  dca: Move syncword definitions to a separate header

Conflicts:
	libavcodec/dca_parser.c
	libavformat/dtsdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>