2 Commits

Author	SHA1	Message	Date
Michael Niedermayer	87db7e7772	Merge commit '25f613f8be3b51e4396b93cda131e4631ba54302' ... * commit '25f613f8be3b51e4396b93cda131e4631ba54302': dca: Move syncword definitions to a separate header Conflicts: libavcodec/dca_parser.c libavformat/dtsdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2015-03-04 19:28:53 +01:00
Diego Biurrun	25f613f8be	dca: Move syncword definitions to a separate header	2015-03-04 13:29:33 +01:00