diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-02 03:37:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-02 03:45:58 +0200 |
| commit | c3f5b8112573245fc5056a49477749df4ed1d0ea (patch) | |
| tree | d55921b265eca41f50c2dac5b317844d7ad7170d /libavcodec/alpha | |
| parent | 3862ebba23cc9a76a004edd4c12d0b853a0426cd (diff) | |
| parent | ad1862d64ae28251e2740e437bbc639492a374a0 (diff) | |
| download | ffmpeg-c3f5b8112573245fc5056a49477749df4ed1d0ea.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
ALPHA: Replace sized int_fast integer types with plain int/unsigned.
Duplicate DPX image encoder
Duplicate DPX decoder: read sample aspect ratio
Duplciate DPX decoder: add buffer size checks.
ac3enc: clip large coefficient values and negative exponents rather than using av_assert2().
ac3enc: do not store a bandwidth code for each channel.
ac3enc: remove bandwidth reduction as fallback for bit allocation failure.
ac3enc: merge compute_exp_strategy_ch() into compute_exp_strategy()
ac3enc: return error if frame+exponent bits are too large instead of using av_assert2().
ac3enc: differentiate between current block and reference block in bit_alloc()
ac3enc: simplify exponent_init() by calculating exponent_group_tab[] based on exponent group sizes.
ac3enc: simplify stereo rematrixing decision options
Include both URLs: Update URL to fate samples
Conflicts:
Changelog
doc/fate.txt
libavcodec/ac3enc.c
libavcodec/dpxenc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/alpha')
| -rw-r--r-- | libavcodec/alpha/simple_idct_alpha.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/alpha/simple_idct_alpha.c b/libavcodec/alpha/simple_idct_alpha.c index 7f396bfe5f..522efd2b4d 100644 --- a/libavcodec/alpha/simple_idct_alpha.c +++ b/libavcodec/alpha/simple_idct_alpha.c @@ -46,7 +46,7 @@ /* 0: all entries 0, 1: only first entry nonzero, 2: otherwise */ static inline int idct_row(DCTELEM *row) { - int_fast32_t a0, a1, a2, a3, b0, b1, b2, b3, t; + int a0, a1, a2, a3, b0, b1, b2, b3, t; uint64_t l, r, t2; l = ldq(row); r = ldq(row + 4); @@ -154,7 +154,7 @@ static inline int idct_row(DCTELEM *row) static inline void idct_col(DCTELEM *col) { - int_fast32_t a0, a1, a2, a3, b0, b1, b2, b3; + int a0, a1, a2, a3, b0, b1, b2, b3; col[0] += (1 << (COL_SHIFT - 1)) / W4; @@ -235,7 +235,7 @@ static inline void idct_col2(DCTELEM *col) uint64_t l, r; for (i = 0; i < 8; ++i) { - int_fast32_t a0 = col[i] + (1 << (COL_SHIFT - 1)) / W4; + int a0 = col[i] + (1 << (COL_SHIFT - 1)) / W4; a0 *= W4; col[i] = a0 >> COL_SHIFT; |