[SCM] libav/experimental: Add const qualifier, fix warnings: snow.c:2292: warning: assignment discards qualifiers from pointer target type snow.c:2294: warning: assignment discards qualifiers from pointer target type snow.c:2300: warning: assignment discards qualifiers from pointer target type
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:12:44 UTC 2013
The following commit has been merged in the experimental branch:
commit f0a708408877b6436e0b9161e44350a78bc40610
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date: Thu Jan 31 00:56:29 2008 +0000
Add const qualifier, fix warnings:
snow.c:2292: warning: assignment discards qualifiers from pointer target type
snow.c:2294: warning: assignment discards qualifiers from pointer target type
snow.c:2300: warning: assignment discards qualifiers from pointer target type
Originally committed as revision 11686 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/snow.c b/libavcodec/snow.c
index eedfe12..67edc34 100644
--- a/libavcodec/snow.c
+++ b/libavcodec/snow.c
@@ -2193,7 +2193,7 @@ static void mc_block(Plane *p, uint8_t *dst, const uint8_t *src, uint8_t *tmp, i
uint8_t tmp2t[3][stride*(32+HTAPS_MAX)];
int16_t *tmpI= tmpIt;
uint8_t *tmp2= tmp2t[0];
- uint8_t *hpel[11];
+ const uint8_t *hpel[11];
START_TIMER
assert(dx<16 && dy<16);
r= brane[dx + 16*dy]&15;
@@ -2302,10 +2302,10 @@ START_TIMER
hpel[10]= hpel[8] + 1;
if(b==15){
- uint8_t *src1= hpel[dx/8 + dy/8*4 ];
- uint8_t *src2= hpel[dx/8 + dy/8*4+1];
- uint8_t *src3= hpel[dx/8 + dy/8*4+4];
- uint8_t *src4= hpel[dx/8 + dy/8*4+5];
+ const uint8_t *src1= hpel[dx/8 + dy/8*4 ];
+ const uint8_t *src2= hpel[dx/8 + dy/8*4+1];
+ const uint8_t *src3= hpel[dx/8 + dy/8*4+4];
+ const uint8_t *src4= hpel[dx/8 + dy/8*4+5];
dx&=7;
dy&=7;
for(y=0; y < b_h; y++){
@@ -2320,8 +2320,8 @@ START_TIMER
dst +=stride;
}
}else{
- uint8_t *src1= hpel[l];
- uint8_t *src2= hpel[r];
+ const uint8_t *src1= hpel[l];
+ const uint8_t *src2= hpel[r];
int a= weight[((dx&7) + (8*(dy&7)))];
int b= 8-a;
for(y=0; y < b_h; y++){
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list