summaryrefslogtreecommitdiff
path: root/libavcodec/dca_syncwords.h
Commit message (Collapse)AuthorAge
* Merge commit '4da5aacc7eba274a4f18411120de539d39c5151e'Michael Niedermayer2015-03-15
|\ | | | | | | | | | | | | * commit '4da5aacc7eba274a4f18411120de539d39c5151e': dca: Mark syncword constants unsigned; they do not fit in 32-bit signed int Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dca: Mark syncword constants unsigned; they do not fit in 32-bit signed intDiego Biurrun2015-03-13
| |
* | Merge commit '25f613f8be3b51e4396b93cda131e4631ba54302'Michael Niedermayer2015-03-04
|/ | | | | | | | | | | * 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>
* dca: Move syncword definitions to a separate headerDiego Biurrun2015-03-04