diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-06-15 22:38:16 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-06-15 22:38:16 +0000 |
| commit | 891263eff20681a225bce5ba45232de40513b9d3 (patch) | |
| tree | d9a9519a51e709440f6d9e111507a11e6e66719f | |
| parent | 0ade7bb6e9a2631cd1068b974ec3fcf4fa9bdc41 (diff) | |
Fix svq3 watermark log uncompress on 64bit, probably fixes issue 1263
Originally committed as revision 23620 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/svq3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index bf7659a80e..df2acd8955 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -886,7 +886,7 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) 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 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) 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; |