Mercurial > libavcodec.hg

changeset 11881:8daf3134622c libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix svq3 watermark log uncompress on 64bit, probably fixes issue 1263
author bcoudurier
date Tue, 15 Jun 2010 22:38:16 +0000
parents 3ab26ab83911
children c591e96c03ab
files svq3.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/svq3.c	Tue Jun 15 09:14:00 2010 +0000
+++ b/svq3.c	Tue Jun 15 22:38:16 2010 +0000
@@ -886,7 +886,7 @@
                 int u2 = get_bits(&gb, 8);
                 int u3 = get_bits(&gb, 2);
                 int u4 = svq3_get_ue_golomb(&gb);
-                unsigned buf_len = watermark_width*watermark_height*4;
+                unsigned long buf_len = watermark_width*watermark_height*4;
                 int offset = (get_bits_count(&gb)+7)>>3;
                 uint8_t *buf;
 
@@ -896,7 +896,7 @@
                 buf = av_malloc(buf_len);
                 av_log(avctx, AV_LOG_DEBUG, "watermark size: %dx%d\n", watermark_width, watermark_height);
                 av_log(avctx, AV_LOG_DEBUG, "u1: %x u2: %x u3: %x compressed data size: %d offset: %d\n", u1, u2, u3, u4, offset);
-                if (uncompress(buf, (uLong*)&buf_len, extradata + 8 + offset, size - offset) != Z_OK) {
+                if (uncompress(buf, &buf_len, extradata + 8 + offset, size - offset) != Z_OK) {
                     av_log(avctx, AV_LOG_ERROR, "could not uncompress watermark logo\n");
                     av_free(buf);
                     return -1;