Merge commit '25f613f8be3b51e4396b93cda131e4631ba54302'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Mar 2015 18:24:12 +0000 (19:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Mar 2015 18:28:53 +0000 (19:28 +0100)
commit87db7e777262a7800cc6c76e07870f7a8f6301ed
treea9ddb30c4f4408ba8a136f13c84d322ba9ea79b6
parent634ce8ddad6b2c03d24bce12ba69f9217729d3f5
parent25f613f8be3b51e4396b93cda131e4631ba54302
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>
libavcodec/dca.c
libavcodec/dca.h
libavcodec/dca_parser.c
libavcodec/dca_syncwords.h
libavcodec/dcadec.c
libavformat/dtsdec.c
libavformat/spdifenc.c