diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2012-02-01 20:23:46 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2012-02-01 20:23:46 +0000 |
| commit | 394844752785840a9a2f50febcaf58f9b8cbc0a7 (patch) | |
| tree | 17043c162190989571f15f7e7c4c5461b674a0b5 /src/xine-engine | |
| parent | 24336d54166a06db00d5e9b24a4039a1760e9d1d (diff) | |
| parent | 15029f2439781c5da7ffcdf18e39ea8ea92b17e9 (diff) | |
| download | xine-lib-394844752785840a9a2f50febcaf58f9b8cbc0a7.tar.gz xine-lib-394844752785840a9a2f50febcaf58f9b8cbc0a7.tar.bz2 | |
Merge from 1.1.
Diffstat (limited to 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/osd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c index 423d72eb6..cf54cac84 100644 --- a/src/xine-engine/osd.c +++ b/src/xine-engine/osd.c @@ -846,7 +846,7 @@ static void osd_set_position (osd_object_t *osd, int x, int y) { osd->display_y = y; } -static uint16_t gzread_i16(gzFile *fp) { +static uint16_t gzread_i16(gzFile fp) { uint16_t ret; ret = gzgetc(fp); ret |= (gzgetc(fp)<<8); @@ -859,7 +859,7 @@ static uint16_t gzread_i16(gzFile *fp) { static int osd_renderer_load_font(osd_renderer_t *this, char *filename) { - gzFile *fp; + gzFile fp; osd_font_t *font = NULL; int i, ret = 0; |