diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-15 21:14:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-15 21:14:46 +0100 |
| commit | e46a7fdc8748c286e391c1e7f2921d98a4486681 (patch) | |
| tree | 16075f1023541e7d411642c7e1a1c674da4feedd | |
| parent | de41d5372faa4ad7ad439e71975fc6f4ea0c0efc (diff) | |
| parent | 4da5aacc7eba274a4f18411120de539d39c5151e (diff) | |
| download | ffmpeg-e46a7fdc8748c286e391c1e7f2921d98a4486681.tar.gz | |
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>
| -rw-r--r-- | libavcodec/dca_syncwords.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libavcodec/dca_syncwords.h b/libavcodec/dca_syncwords.h index 24f43a47f9..3466b6bc6f 100644 --- a/libavcodec/dca_syncwords.h +++ b/libavcodec/dca_syncwords.h @@ -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 */ |