[FFmpeg-cvslog] exr: merge common code
Paul B Mahol
git at videolan.org
Fri Jul 20 20:14:22 CEST 2012
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Thu Jul 19 18:00:10 2012 +0000| [01f76a779c121bc6f27ea758e18b61c3063c249b] | committer: Paul B Mahol
exr: merge common code
Signed-off-by: Paul B Mahol <onemda at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=01f76a779c121bc6f27ea758e18b61c3063c249b
---
libavcodec/exr.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index 4945ad7..cbd724f 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])
More information about the ffmpeg-cvslog
mailing list