diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2011-09-16 13:24:08 +0300 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2011-09-16 13:24:08 +0300 |
| commit | 94854aaccd747984e7b6a8414fd253eb23573b8b (patch) | |
| tree | 4778a1c9e5c963d836e3fcba59c22cb0c4e2e75e | |
| parent | c0c516e97e06d5d39805469d0eb8f80021ec32da (diff) | |
| download | xine-lib-94854aaccd747984e7b6a8414fd253eb23573b8b.tar.gz xine-lib-94854aaccd747984e7b6a8414fd253eb23573b8b.tar.bz2 | |
Fixed "warning: cast from pointer to integer of different size"
| -rw-r--r-- | src/combined/ffmpeg/ff_audio_decoder.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c index f554a8b8f..269342ddb 100644 --- a/src/combined/ffmpeg/ff_audio_decoder.c +++ b/src/combined/ffmpeg/ff_audio_decoder.c @@ -85,7 +85,7 @@ typedef struct ff_audio_decoder_s { #define free16(p) realloc16(p,0) static void *realloc16 (void *m, size_t s) { - unsigned int diff, diff2; + unsigned long diff, diff2; unsigned char *p = m, *q; if (p) { diff = p[-1]; @@ -95,13 +95,13 @@ static void *realloc16 (void *m, size_t s) { } q = realloc (p - diff, s + 16); if (!q) return (q); - diff2 = 16 - ((unsigned int)q & 15); + diff2 = 16 - ((unsigned long)q & 15); if (diff2 != diff) memmove (q + diff2, q + diff, s); } else { if (s == 0) return (NULL); q = malloc (s + 16); if (!q) return (q); - diff2 = 16 - ((unsigned int)q & 15); + diff2 = 16 - ((unsigned long)q & 15); } q += diff2; q[-1] = diff2; |