[SCM] libav/experimental: add const, fix warning: cook.c:276: warning: passing argument 2 of 'maybe_reformat_buffer32' discards qualifiers from pointer target type

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


The following commit has been merged in the experimental branch:
commit 29e15adc3410bff4ce6cce5ba53364554685656f
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Wed Jan 30 23:58:44 2008 +0000

    add const, fix warning: cook.c:276: warning: passing argument 2 of 'maybe_reformat_buffer32' discards qualifiers from pointer target type
    
    Originally committed as revision 11674 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index 43b661d..193931a 100644
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -145,7 +145,7 @@ typedef struct cook {
     float               decode_buffer_2[1024];
     float               decode_buffer_0[1060]; /* static allocation for joint decode */
 
-    float               *cplscales[5];
+    const float         *cplscales[5];
 } COOKContext;
 
 /* debug functions */
@@ -264,7 +264,7 @@ static int init_cook_mlt(COOKContext *q) {
     return 0;
 }
 
-static float *maybe_reformat_buffer32 (COOKContext *q, float *ptr, int n)
+static const float *maybe_reformat_buffer32 (COOKContext *q, const float *ptr, int n)
 {
     if (1)
         return ptr;
@@ -832,7 +832,7 @@ static void joint_decode(COOKContext *q, float* mlt_buffer1,
     float *decode_buffer = q->decode_buffer_0;
     int idx, cpl_tmp;
     float f1,f2;
-    float* cplscale;
+    const float* cplscale;
 
     memset(decouple_tab, 0, sizeof(decouple_tab));
     memset(decode_buffer, 0, sizeof(decode_buffer));

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list