]> git.sesse.net Git - ffmpeg/commitdiff
exr: fix header parsing
authorJean First <jeanfirst@gmail.com>
Tue, 15 May 2012 14:34:58 +0000 (16:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 20 May 2012 14:39:08 +0000 (16:39 +0200)
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>
libavcodec/exr.c

index 3a93f2287ceb12ded01c396d0cb94b514cb757c9..0ef8db50f466cd8867bb8560f0f363f290ecd181 100644 (file)
@@ -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;