Mercurial > libavcodec.hg
comparison dsputil.c @ 2834:fd5d7c732c6b libavcodec
kill a bunch of compiler warnings
| author | mru |
|---|---|
| date | Sun, 14 Aug 2005 15:42:40 +0000 |
| parents | 01ed2c3b8f08 |
| children | ef2149182f1c |
comparison
equal
deleted
inserted
replaced
| 2833:1f117208d20f | 2834:fd5d7c732c6b |
|---|---|
| 2986 pix3 += line_size; | 2986 pix3 += line_size; |
| 2987 } | 2987 } |
| 2988 return s; | 2988 return s; |
| 2989 } | 2989 } |
| 2990 | 2990 |
| 2991 static int nsse16_c(MpegEncContext *c, uint8_t *s1, uint8_t *s2, int stride, int h){ | 2991 static int nsse16_c(void *v, uint8_t *s1, uint8_t *s2, int stride, int h){ |
| 2992 MpegEncContext *c = v; | |
| 2992 int score1=0; | 2993 int score1=0; |
| 2993 int score2=0; | 2994 int score2=0; |
| 2994 int x,y; | 2995 int x,y; |
| 2995 | 2996 |
| 2996 for(y=0; y<h; y++){ | 2997 for(y=0; y<h; y++){ |
| 3011 | 3012 |
| 3012 if(c) return score1 + ABS(score2)*c->avctx->nsse_weight; | 3013 if(c) return score1 + ABS(score2)*c->avctx->nsse_weight; |
| 3013 else return score1 + ABS(score2)*8; | 3014 else return score1 + ABS(score2)*8; |
| 3014 } | 3015 } |
| 3015 | 3016 |
| 3016 static int nsse8_c(MpegEncContext *c, uint8_t *s1, uint8_t *s2, int stride, int h){ | 3017 static int nsse8_c(void *v, uint8_t *s1, uint8_t *s2, int stride, int h){ |
| 3018 MpegEncContext *c = v; | |
| 3017 int score1=0; | 3019 int score1=0; |
| 3018 int score2=0; | 3020 int score2=0; |
| 3019 int x,y; | 3021 int x,y; |
| 3020 | 3022 |
| 3021 for(y=0; y<h; y++){ | 3023 for(y=0; y<h; y++){ |