aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean First <jeanfirst@gmail.com>2012-05-15 16:34:58 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-05-20 16:39:08 +0200
commitf7985f348f1eb3ec6a1670bc1accfe2c80b55148 (patch)
tree200a00c60d049fcaa199f662c1934f8fb03937ef
parent9225513242b48b7423cec1956b4216720173f0bc (diff)
downloadffmpeg-f7985f348f1eb3ec6a1670bc1accfe2c80b55148.tar.gz
exr: fix header parsing
the header in the sample provided for ticket #1306 is not parsed correctly and thus ffmpeg tries to decode the sample instead of abording the decoding. I tested it with two other exr samples I have - one float, one half float - and they still decode correctly. Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/exr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index 3a93f2287c..0ef8db50f4 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -198,7 +198,7 @@ static int decode_frame(AVCodecContext *avctx,
if (!variable_buffer_data_size)
return -1;
- channel_list_end = buf + variable_buffer_data_size + 4;
+ channel_list_end = buf + variable_buffer_data_size;
while (channel_list_end - buf >= 19) {
int current_bits_per_color_id = -1;
int channel_index = -1;