[FFmpeg-cvslog] exr: reset compression in decode_frame()

Paul B Mahol git at videolan.org
Thu Feb 21 13:05:12 CET 2013


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Thu Feb 21 11:38:10 2013 +0000| [a3d890527ed3d4d65f3ed84e72df20b16e78dc80] | committer: Paul B Mahol

exr: reset compression in decode_frame()

This fixes decoding of images if compression changes.
Regression since b040ffc84c5e.

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a3d890527ed3d4d65f3ed84e72df20b16e78dc80
---

 libavcodec/exr.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index fef0d10..2b01e5a 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -258,6 +258,7 @@ static int decode_frame(AVCodecContext *avctx,
     s->channel_offsets[2] = -1;
     s->channel_offsets[3] = -1;
     s->bits_per_color_id = -1;
+    s->compr = -1;
 
     if (buf_size < 10) {
         av_log(avctx, AV_LOG_ERROR, "Too short header to parse\n");
@@ -645,8 +646,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
     avcodec_get_frame_defaults(&s->picture);
     avctx->coded_frame = &s->picture;
 
-    s->compr = -1;
-
     return 0;
 }
 



More information about the ffmpeg-cvslog mailing list