summaryrefslogtreecommitdiff
path: root/libavcodec/xxan.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-12 15:57:23 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-12 15:57:28 +0100
commitb36095ea0f668e2b7aac33643a6a33d03433a418 (patch)
treec937aa0852722988728bd5063ee871ea5932b9bf /libavcodec/xxan.c
parentf506ae19ffb5ad1366a889b4dbec16254db4b755 (diff)
parent3e2f200237af977b9253b0aff121eee27bcedb44 (diff)
downloadffmpeg-b36095ea0f668e2b7aac33643a6a33d03433a418.tar.gz
Merge commit '3e2f200237af977b9253b0aff121eee27bcedb44'
* commit '3e2f200237af977b9253b0aff121eee27bcedb44': roqvideodec: fix a potential infinite loop in roqvideo_decode_frame(). xxan: fix invalid memory access in xan_decode_frame_type0() tty: set avg_frame_rate. FATE: enable multiple slices in the ffv1 vsynth test Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xxan.c')
-rw-r--r--libavcodec/xxan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/xxan.c b/libavcodec/xxan.c
index 8df097bdee..148b058e28 100644
--- a/libavcodec/xxan.c
+++ b/libavcodec/xxan.c
@@ -316,7 +316,7 @@ static int xan_decode_frame_type0(AVCodecContext *avctx)
int dec_size;
bytestream2_seek(&s->gb, 8 + corr_off, SEEK_SET);
- dec_size = xan_unpack(s, s->scratch_buffer, s->buffer_size);
+ dec_size = xan_unpack(s, s->scratch_buffer, s->buffer_size / 2);
if (dec_size < 0)
dec_size = 0;
else