[FFmpeg-cvslog] libavcodec/exr: fix PRX24 Float decompression
Martin Vignali
git at videolan.org
Sun Apr 3 17:11:19 CEST 2016
ffmpeg | branch: master | Martin Vignali <martin.vignali at gmail.com> | Sun Apr 3 14:12:44 2016 +0200| [d2ed3391fbfe3d6806c7819f86a5aa43b89b3144] | committer: Paul B Mahol
libavcodec/exr: fix PRX24 Float decompression
Signed-off-by: Paul B Mahol <onemda at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d2ed3391fbfe3d6806c7819f86a5aa43b89b3144
---
libavcodec/exr.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index f6141fa..aaac3be 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -778,14 +778,23 @@ static int pxr24_uncompress(EXRContext *s, const uint8_t *src,
int compressed_size, int uncompressed_size,
EXRThreadData *td)
{
- unsigned long dest_len = uncompressed_size;
+ unsigned long dest_len, expected_len;
const uint8_t *in = td->tmp;
uint8_t *out;
int c, i, j;
- if (uncompress(td->tmp, &dest_len, src, compressed_size) != Z_OK ||
- dest_len != uncompressed_size)
+ if (s->pixel_type == EXR_FLOAT)
+ expected_len = (uncompressed_size / 4) * 3; /* PRX 24 store float in 24 bit instead of 32 */
+ else
+ expected_len = uncompressed_size;
+
+ dest_len = expected_len;
+
+ if (uncompress(td->tmp, &dest_len, src, compressed_size) != Z_OK) {
return AVERROR_INVALIDDATA;
+ } else if (dest_len != expected_len){
+ return AVERROR_INVALIDDATA;
+ }
out = td->uncompressed_data;
for (i = 0; i < s->ysize; i++)
More information about the ffmpeg-cvslog
mailing list