summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Ross <pross@xvid.org>2012-11-25 22:04:11 +1100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-25 14:40:36 +0100
commitfdd71cf04c4fdcea0af911d808687c07d150fee2 (patch)
tree9ff5aab76818920e5c6ddbcc4a7723fecc936b8f
parent8f507feecbe9e276695b10e85e1e8bf38cd2c3f8 (diff)
downloadffmpeg-fdd71cf04c4fdcea0af911d808687c07d150fee2.tar.gz
iff decoder: initialise HAM line decoder with first palette entry
The palette is organised into 'hold' and 'modify' pairs, hence why the first palette entry is pal[1]. Fixes ticket #1701. Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/iff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index 7fa0d52515..a52a1bc6a9 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -428,7 +428,7 @@ static void decodeplane32(uint32_t *dst, const uint8_t *buf, int buf_size, int p
static void decode_ham_plane32(uint32_t *dst, const uint8_t *buf,
const uint32_t *const pal, unsigned buf_size)
{
- uint32_t delta = 0;
+ uint32_t delta = pal[1]; /* first palette entry */
do {
uint32_t first, second;
DECODE_HAM_PLANE32(0);