diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2005-10-23 02:11:16 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2005-10-23 02:11:16 +0000 |
| commit | 712a40b59a0f451a558d88db1f9f124463016f97 (patch) | |
| tree | 82bc80e9b7a5ba09c01acf205c8ac1e20c44914f /src/libffmpeg/libavcodec/dsputil.c | |
| parent | 640063a719556f8569fe848528b39660c6fc31a6 (diff) | |
| download | xine-lib-712a40b59a0f451a558d88db1f9f124463016f97.tar.gz xine-lib-712a40b59a0f451a558d88db1f9f124463016f97.tar.bz2 | |
big ffmpeg update
it is likely to break, so please keep both pieces
CVS patchset: 7767
CVS date: 2005/10/23 02:11:16
Diffstat (limited to 'src/libffmpeg/libavcodec/dsputil.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/dsputil.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libffmpeg/libavcodec/dsputil.c b/src/libffmpeg/libavcodec/dsputil.c index 698b906ea..5a23672a3 100644 --- a/src/libffmpeg/libavcodec/dsputil.c +++ b/src/libffmpeg/libavcodec/dsputil.c @@ -2990,7 +2990,8 @@ static int pix_abs8_xy2_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, return s; } -static int nsse16_c(MpegEncContext *c, uint8_t *s1, uint8_t *s2, int stride, int h){ +static int nsse16_c(void *v, uint8_t *s1, uint8_t *s2, int stride, int h){ + MpegEncContext *c = v; int score1=0; int score2=0; int x,y; @@ -3015,7 +3016,8 @@ static int nsse16_c(MpegEncContext *c, uint8_t *s1, uint8_t *s2, int stride, int else return score1 + ABS(score2)*8; } -static int nsse8_c(MpegEncContext *c, uint8_t *s1, uint8_t *s2, int stride, int h){ +static int nsse8_c(void *v, uint8_t *s1, uint8_t *s2, int stride, int h){ + MpegEncContext *c = v; int score1=0; int score2=0; int x,y; |