[FFmpeg-cvslog] exr: fix header parsing
Jean First
git at videolan.org
Sun May 20 16:40:06 CEST 2012
ffmpeg | branch: master | Jean First <jeanfirst at gmail.com> | Tue May 15 16:34:58 2012 +0200| [f7985f348f1eb3ec6a1670bc1accfe2c80b55148] | committer: Michael Niedermayer
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 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f7985f348f1eb3ec6a1670bc1accfe2c80b55148
---
libavcodec/exr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index 3a93f22..0ef8db5 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;
More information about the ffmpeg-cvslog
mailing list