diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2011-04-28 09:36:00 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-05-02 00:46:48 +0300 |
| commit | 6506d4ad84eac67e69437def2c8ee69fcfc14ed5 (patch) | |
| tree | 255e7f58b809a9bc7377047533cfb19399ce4ffd /libvo | |
| parent | 7e65428712beacd416dc3410c52f22ebfd3b4c53 (diff) | |
| download | mpv-6506d4ad84eac67e69437def2c8ee69fcfc14ed5.tar.bz2 mpv-6506d4ad84eac67e69437def2c8ee69fcfc14ed5.tar.xz | |
cleanup: remove more warnings
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/video_out_internal.h | 1 | ||||
| -rw-r--r-- | libvo/vo_sdl.c | 10 |
2 files changed, 3 insertions, 8 deletions
diff --git a/libvo/video_out_internal.h b/libvo/video_out_internal.h index 8595d4ef05..263a94e695 100644 --- a/libvo/video_out_internal.h +++ b/libvo/video_out_internal.h @@ -40,7 +40,6 @@ static void draw_osd(void); static void flip_page(void); static void check_events(void); static void uninit(void); -static int query_format(uint32_t format); static int preinit(const char *); #define LIBVO_EXTERN(x) struct vo_driver video_out_##x =\ diff --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c index be6e741295..ae16d0e599 100644 --- a/libvo/vo_sdl.c +++ b/libvo/vo_sdl.c @@ -66,6 +66,7 @@ #include "sub/sub.h" #include "aspect.h" #include "libmpcodecs/vfcap.h" +#include "ffmpeg_files/bswap.h" #ifdef CONFIG_X11 #include <X11/Xlib.h> @@ -1185,13 +1186,10 @@ static void erase_rectangle(int x, int y, int w, int h) case IMGFMT_YUY2: case IMGFMT_YVYU: { - /* yuy2 and yvyu represent black the same way */ - uint8_t yuy2_black[] = {0, 128, 0, 128}; - SDL_OVR_LOCK((void) 0) erase_area_4(x*2, w*2, h, priv->overlay->pitches[0], - *((uint32_t*) yuy2_black), + be2me_32(0x00800080), /* yuy2 and yvyu represent black the same way */ priv->overlay->pixels[0] + priv->overlay->pitches[0]*y); SDL_OVR_UNLOCK @@ -1200,12 +1198,10 @@ static void erase_rectangle(int x, int y, int w, int h) case IMGFMT_UYVY: { - uint8_t uyvy_black[] = {128, 0, 128, 0}; - SDL_OVR_LOCK((void) 0) erase_area_4(x*2, w*2, h, priv->overlay->pitches[0], - *((uint32_t*) uyvy_black), + be2me_32(0x80008000), priv->overlay->pixels[0] + priv->overlay->pitches[0]*y); SDL_OVR_UNLOCK |