diff options
author | Clément Bœsch <ubitux@gmail.com> | 2011-05-04 22:12:55 +0200 |
---|---|---|
committer | Uoti Urpala <uau@mplayer2.org> | 2011-05-06 18:33:16 +0300 |
commit | b68f9fef32971095836ea6bbeb2f12af417120d2 (patch) | |
tree | 46288d0356764318d595a946d22ca31eaf6b0101 /libvo/vo_aa.c | |
parent | 40f6ab5064a628dc11b79b5e571dc9444efac093 (diff) | |
download | mpv-b68f9fef32971095836ea6bbeb2f12af417120d2.tar.bz2 mpv-b68f9fef32971095836ea6bbeb2f12af417120d2.tar.xz |
cleanup: shut up more warnings
Diffstat (limited to 'libvo/vo_aa.c')
-rw-r--r-- | libvo/vo_aa.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c index cfe0b10e71..4908e3c899 100644 --- a/libvo/vo_aa.c +++ b/libvo/vo_aa.c @@ -349,7 +349,7 @@ draw_frame(uint8_t *src[]) { break; } - sws_scale(sws,src,stride,0,src_height,image,image_stride); + sws_scale(sws,(const uint8_t **)src,stride,0,src_height,image,image_stride); /* Now 'ASCIInate' the image */ if (fast) @@ -369,7 +369,7 @@ draw_slice(uint8_t *src[], int stride[], int dx2 = screen_x + ((x+w) * screen_w / src_width); int dy2 = screen_y + ((y+h) * screen_h / src_height); - sws_scale(sws,src,stride,y,h,image,image_stride); + sws_scale(sws,(const uint8_t **)src,stride,y,h,image,image_stride); /* Now 'ASCIInate' the image */ if (fast) @@ -668,7 +668,7 @@ static int preinit(const char *arg) { char * hidis = NULL; struct stat sbuf; - int fd, vt, major, minor; + int fd, vt; FILE * fp; char fname[12]; @@ -686,8 +686,7 @@ static int preinit(const char *arg) /* check only, if no driver is explicit set */ fd = dup (fileno (stderr)); fstat (fd, &sbuf); - major = sbuf.st_rdev >> 8; - vt = minor = sbuf.st_rdev & 0xff; + vt = sbuf.st_rdev & 0xff; // hi: major, low: minor close (fd); sprintf (fname, "/dev/vcsa%2.2i", vt); fp = fopen (fname, "w+"); |