[FFmpeg-cvslog] Revert "avcodec/exr: fix memset first arg in reverse_lut()"

Michael Niedermayer git at videolan.org
Sat Apr 11 22:12:27 CEST 2015


ffmpeg | branch: release/2.6 | Michael Niedermayer <michaelni at gmx.at> | Wed Apr  1 19:53:23 2015 +0200| [fa538f1a8c33eed6dca8a67656ace6398a0ce323] | committer: Michael Niedermayer

Revert "avcodec/exr: fix memset first arg in reverse_lut()"

This reverts commit 586ba24ff29468d2a4ee843a9650feea5b2be6f6.

Fixes Ticket 4386

Found-by: Martin Vignali <martin.vignali at gmail.com>
(cherry picked from commit 5dd5b7d5312d2b7cb6d3dbfde12f1eaef7c7767f)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/exr.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index 6251fb7..f9525ec 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -322,7 +322,7 @@ static uint16_t reverse_lut(const uint8_t *bitmap, uint16_t *lut)
 
     i = k - 1;
 
-    memset(lut + k * 2, 0, (USHORT_RANGE - k) * 2);
+    memset(lut + k, 0, (USHORT_RANGE - k) * 2);
 
     return i;
 }



More information about the ffmpeg-cvslog mailing list