diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
| commit | 030130942562bb7b84eeba53e0226abed5a63a4c (patch) | |
| tree | 9b49208facf2801369c9d2d7b3e7af11fab36829 /libvo/vo_winvidix.c | |
| parent | 562d86d95cbba67cb58358f6fc334553a467dee7 (diff) | |
| parent | 15a80092161a1cd305f8005c780c744416a5252b (diff) | |
| download | mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.bz2 mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.xz | |
Merge svn changes up to 27824
Conflicts:
cfg-common-opts.h
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libvo/x11_common.h
mplayer.c
stream/cache2.c
Diffstat (limited to 'libvo/vo_winvidix.c')
| -rw-r--r-- | libvo/vo_winvidix.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libvo/vo_winvidix.c b/libvo/vo_winvidix.c index 2581310596..2a8959fa5c 100644 --- a/libvo/vo_winvidix.c +++ b/libvo/vo_winvidix.c @@ -48,7 +48,6 @@ static int depthonscreen; static uint32_t image_width; static uint32_t image_height; static uint32_t image_format; -static HWND hWnd; /* Window parameters */ static HWND hWnd=NULL,hWndFS=NULL; static float window_aspect; |