diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-28 09:27:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-28 09:28:01 +0200 |
| commit | 44187717c1611695ff441d22f29c7882bd318ae4 (patch) | |
| tree | 949776a1190eecf80b669ba277b2d83b952dd15d /libavcodec/binkdata.h | |
| parent | faa338183ba44051e05019411956b41c257c2510 (diff) | |
| parent | ca6a90465634152c7abe2f10112fd06dc778122f (diff) | |
| download | ffmpeg-44187717c1611695ff441d22f29c7882bd318ae4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ppc: remove redundant setting of Altivec IDCT
mpegvideo: initialise DSPContext in ff_dct_common_init()
cosmetics: reindent
eac3enc: support writing of basic mixing and info metadata
dnxhdenc: fix declarations in for loops
dsputil: remove stale bink prototypes and comments
dsputil: move a bink-only function to binkdsp
dsputil: remove some unused functions
bink: make IDCT take 32-bit input
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/binkdata.h')
| -rw-r--r-- | libavcodec/binkdata.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/binkdata.h b/libavcodec/binkdata.h index 2c20b4a4c1..b9dc1f2639 100644 --- a/libavcodec/binkdata.h +++ b/libavcodec/binkdata.h @@ -285,7 +285,7 @@ static const uint8_t bink_patterns[16][64] = { } }; -static const uint32_t bink_intra_quant[16][64] = { +static const int32_t bink_intra_quant[16][64] = { { 0x010000, 0x016315, 0x01E83D, 0x02A535, 0x014E7B, 0x016577, 0x02F1E6, 0x02724C, 0x010000, 0x00EEDA, 0x024102, 0x017F9B, 0x00BE80, 0x00611E, 0x01083C, 0x00A552, @@ -448,7 +448,7 @@ static const uint32_t bink_intra_quant[16][64] = { }, }; -static const uint32_t bink_inter_quant[16][64] = { +static const int32_t bink_inter_quant[16][64] = { { 0x010000, 0x017946, 0x01A5A9, 0x0248DC, 0x016363, 0x0152A7, 0x0243EC, 0x0209EA, 0x012000, 0x00E248, 0x01BBDA, 0x015CBC, 0x00A486, 0x0053E0, 0x00F036, 0x008095, |