diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 10:04:02 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 10:04:02 +0400 |
commit | 91db8ff203048e3d6fed589e8352d3a5407d4302 (patch) | |
tree | 7d770c4048628cb98bc8bbbf9fee45b088711345 /libavformat/smacker.c | |
parent | 97f7586cd6a1c3741258d6d70b3cbbbde15b1618 (diff) | |
parent | 564b7e0c0095768cd20001b28154d69462be54e7 (diff) |
Merge commit '564b7e0c0095768cd20001b28154d69462be54e7'
* commit '564b7e0c0095768cd20001b28154d69462be54e7':
matroskadec: silently skip CodecState element.
smacker: fix off-by-one error in palette expanding code
Conflicts:
libavformat/smacker.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/smacker.c')
-rw-r--r-- | libavformat/smacker.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/smacker.c b/libavformat/smacker.c index 84481e22a6..7f270b48b1 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -276,7 +276,7 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt) } else if(t & 0x40){ /* copy with offset */ off = avio_r8(s->pb); j = (t & 0x3F) + 1; - if (off + j - 1 > 0xff) { + if (off + j > 0x100) { av_log(s, AV_LOG_ERROR, "Invalid palette update, offset=%d length=%d extends beyond palette size\n", off, j); |