[FFmpeg-cvslog] exr: display warning if multiple compression attributes are found

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:04:49 2012 +0000| [b040ffc84c5e35436590e0bcea6608a2ad31cf84] | committer: Paul B Mahol

exr: display warning if multiple compression attributes are found

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b040ffc84c5e35436590e0bcea6608a2ad31cf84
---

 libavcodec/exr.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index cbd724f..b5c68de 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -403,7 +403,10 @@ static int decode_frame(AVCodecContext *avctx,
             if (!variable_buffer_data_size)
                 return AVERROR_INVALIDDATA;
 
-            s->compr = *buf;
+            if (s->compr == -1)
+                s->compr = *buf;
+            else
+                av_log(avctx, AV_LOG_WARNING, "Found more than one compression attribute\n");
 
             buf += variable_buffer_data_size;
             continue;



More information about the ffmpeg-cvslog mailing list