diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-29 15:12:19 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-29 15:36:51 +0300 |
commit | 77ec83e351ca7218464f8f77a711520d68fa2e5d (patch) | |
tree | a34d66134176ded3eeff149c756eecfd0ea52304 /libvo/vo_xv.c | |
parent | f59cda84b1e52293e656fffea1529896d28b2d21 (diff) | |
download | mpv-77ec83e351ca7218464f8f77a711520d68fa2e5d.tar.bz2 mpv-77ec83e351ca7218464f8f77a711520d68fa2e5d.tar.xz |
Add a context for mp_fifo
Store data in an allocated context and take it as an argument instead
of using static variables.
Diffstat (limited to 'libvo/vo_xv.c')
-rw-r--r-- | libvo/vo_xv.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 885bd0f7f1..29374ed0e6 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -718,8 +718,9 @@ static void uninit(struct vo *vo) static int x11_fd_callback(void *ctx, int fd) { - check_events(ctx); - return mplayer_get_key(NULL, 0); + struct vo *vo = ctx; + check_events(vo); + return mplayer_get_key(vo->key_fifo, 0); } static int preinit(struct vo *vo, const char *arg) |