aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2012-07-19 18:00:10 +0000
committerPaul B Mahol <onemda@gmail.com>2012-07-20 18:13:25 +0000
commit01f76a779c121bc6f27ea758e18b61c3063c249b (patch)
treed8d7c2b10436abe80425a8f600194df98b6462ed
parenta2dab7512e7c5d0e0e19e945880d80de3e4df0d2 (diff)
downloadffmpeg-01f76a779c121bc6f27ea758e18b61c3063c249b.tar.gz
exr: merge common code
Signed-off-by: Paul B Mahol <onemda@gmail.com>
-rw-r--r--libavcodec/exr.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index 4945ad7eb2..cbd724f92b 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -404,18 +404,6 @@ static int decode_frame(AVCodecContext *avctx,
return AVERROR_INVALIDDATA;
s->compr = *buf;
- switch (s->compr) {
- case EXR_RAW:
- case EXR_RLE:
- case EXR_ZIP1:
- case EXR_ZIP16:
- break;
- case EXR_PIZ:
- case EXR_B44:
- default:
- av_log(avctx, AV_LOG_ERROR, "Compression type %d is not supported\n", s->compr);
- return AVERROR_PATCHWELCOME;
- }
buf += variable_buffer_data_size;
continue;
@@ -483,6 +471,9 @@ static int decode_frame(AVCodecContext *avctx,
case EXR_ZIP16:
scan_lines_per_block = 16;
break;
+ default:
+ av_log(avctx, AV_LOG_ERROR, "Compression type %d is not supported\n", s->compr);
+ return AVERROR_PATCHWELCOME;
}
if (s->picture.data[0])