diff options
| author | Paul B Mahol <onemda@gmail.com> | 2013-02-21 11:38:10 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2013-02-21 12:02:18 +0000 |
| commit | a3d890527ed3d4d65f3ed84e72df20b16e78dc80 (patch) | |
| tree | 5f085a59900c0804eab2e92fab707580ddf5cf1e /libavcodec/exr.c | |
| parent | 6b8f21190d5a01ee68103f77ccef59c709c7d75e (diff) | |
| download | ffmpeg-a3d890527ed3d4d65f3ed84e72df20b16e78dc80.tar.gz | |
exr: reset compression in decode_frame()
This fixes decoding of images if compression changes.
Regression since b040ffc84c5e.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/exr.c')
| -rw-r--r-- | libavcodec/exr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/exr.c b/libavcodec/exr.c index fef0d105e0..2b01e5aa16 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; } |