[SCM] libav/experimental: cast to correct type, fix warning: apedec.c:859: warning: passing argument 1 of 's->dsp.bswap_buf' from incompatible pointer type

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:12:39 UTC 2013


The following commit has been merged in the experimental branch:
commit 774c84770f88309c734efabe6cc7c6ce764809d7
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Thu Jan 31 00:10:56 2008 +0000

    cast to correct type, fix warning: apedec.c:859: warning: passing argument 1 of 's->dsp.bswap_buf' from incompatible pointer type
    
    Originally committed as revision 11679 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index 29d4d3f..5421aad 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -856,7 +856,7 @@ static int ape_decode_frame(AVCodecContext * avctx,
 
     if(!s->samples){
         s->data = av_realloc(s->data, (buf_size + 3) & ~3);
-        s->dsp.bswap_buf(s->data, buf, buf_size >> 2);
+        s->dsp.bswap_buf((uint32_t*)s->data, (uint32_t*)buf, buf_size >> 2);
         s->ptr = s->last_ptr = s->data;
         s->data_end = s->data + buf_size;
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list