diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-16 14:10:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-16 14:10:09 +0100 |
| commit | aef816f957eec100da42bcbf65e3bfe86df679fa (patch) | |
| tree | 15bdbdde9fa060b95e64be2c628ed17efbb15530 /libavcodec | |
| parent | e4e4add0e3ba7d8ca8ed9135288da910270d2ea3 (diff) | |
| parent | ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6 (diff) | |
Merge commit 'ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6'
* commit 'ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6':
lzo: fix overflow checking in copy_backptr()
flacdec: simplify bounds checking in flac_probe()
atrac3: avoid oversized shifting in decode_bytes()
Conflicts:
libavformat/flacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/atrac3.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index ac240d7007..a9e98f807b 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -164,7 +164,10 @@ static int decode_bytes(const uint8_t *input, uint8_t *out, int bytes) off = (intptr_t)input & 3; buf = (const uint32_t *)(input - off); - c = av_be2ne32((0x537F6103 >> (off * 8)) | (0x537F6103 << (32 - (off * 8)))); + if (off) + c = av_be2ne32((0x537F6103U >> (off * 8)) | (0x537F6103U << (32 - (off * 8)))); + else + c = av_be2ne32(0x537F6103U); bytes += 3 + off; for (i = 0; i < bytes / 4; i++) output[i] = c ^ buf[i]; |