virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

exr: merge common code

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2012-07-19 18:00:10 +00:00
parent a2dab7512e
commit 01f76a779c
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/exr.c
View File

@ -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])