Merge commit '4da5aacc7eba274a4f18411120de539d39c5151e'

* commit '4da5aacc7eba274a4f18411120de539d39c5151e':
  dca: Mark syncword constants unsigned; they do not fit in 32-bit signed int

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-15 21:14:39 +01:00
commit e46a7fdc87
1 changed files with 12 additions and 12 deletions

View File

@ -20,18 +20,18 @@
#define AVCODEC_DCA_SYNCWORDS_H
enum DCASyncwords {
DCA_SYNCWORD_CORE_BE = 0x7FFE8001,
DCA_SYNCWORD_CORE_LE = 0xFE7F0180,
DCA_SYNCWORD_CORE_14B_BE = 0x1FFFE800,
DCA_SYNCWORD_CORE_14B_LE = 0xFF1F00E8,
DCA_SYNCWORD_XCH = 0x5A5A5A5A,
DCA_SYNCWORD_XXCH = 0x47004A03,
DCA_SYNCWORD_X96 = 0x1D95F262,
DCA_SYNCWORD_XBR = 0x655E315E,
DCA_SYNCWORD_LBR = 0x0A801921,
DCA_SYNCWORD_XLL = 0x41A29547,
DCA_SYNCWORD_SUBSTREAM = 0x64582025,
DCA_SYNCWORD_SUBSTREAM_CORE = 0x02B09261,
DCA_SYNCWORD_CORE_BE = 0x7FFE8001U,
DCA_SYNCWORD_CORE_LE = 0xFE7F0180U,
DCA_SYNCWORD_CORE_14B_BE = 0x1FFFE800U,
DCA_SYNCWORD_CORE_14B_LE = 0xFF1F00E8U,
DCA_SYNCWORD_XCH = 0x5A5A5A5AU,
DCA_SYNCWORD_XXCH = 0x47004A03U,
DCA_SYNCWORD_X96 = 0x1D95F262U,
DCA_SYNCWORD_XBR = 0x655E315EU,
DCA_SYNCWORD_LBR = 0x0A801921U,
DCA_SYNCWORD_XLL = 0x41A29547U,
DCA_SYNCWORD_SUBSTREAM = 0x64582025U,
DCA_SYNCWORD_SUBSTREAM_CORE = 0x02B09261U,
};
#endif /* AVCODEC_DCA_SYNCWORDS_H */