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/video_out.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/video_out.c')
| -rw-r--r-- | libvo/video_out.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c index de060dacf6..78f1f71743 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -293,7 +293,8 @@ void list_video_out(void) mp_msg(MSGT_GLOBAL, MSGL_INFO,"\n"); } -struct vo *init_best_video_out(struct MPOpts *opts, struct vo_x11_state *x11) +struct vo *init_best_video_out(struct MPOpts *opts, struct vo_x11_state *x11, + struct mp_fifo *key_fifo) { char **vo_list = opts->video_driver_list; int i; @@ -316,7 +317,8 @@ struct vo *init_best_video_out(struct MPOpts *opts, struct vo_x11_state *x11) const vo_info_t *info = video_driver->info; if (!strcmp(info->short_name, name)) { // name matches, try it - *vo = (struct vo){.opts = opts, .x11 = x11}; + *vo = (struct vo){.opts = opts, .x11 = x11, + .key_fifo = key_fifo}; vo->driver = video_driver; if (!vo_preinit(vo, vo_subdevice)) { free(name); @@ -334,7 +336,7 @@ struct vo *init_best_video_out(struct MPOpts *opts, struct vo_x11_state *x11) vo_subdevice = NULL; for (i = 0; video_out_drivers[i]; i++) { const struct vo_driver *video_driver = video_out_drivers[i]; - *vo = (struct vo){.opts = opts, .x11 = x11}; + *vo = (struct vo){.opts = opts, .x11 = x11, key_fifo = key_fifo}; vo->driver = video_driver; if (!vo_preinit(vo, vo_subdevice)) return vo; // success! |