summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-04 17:53:30 +0200
committerwm4 <wm4@nowhere>2013-07-04 17:53:30 +0200
commitd084f72a6cf47b9c232243398fced85c4c620ff6 (patch)
tree03c4dc22ba78b31c53cace4b9088b99189f4ac2c /video
parent1789449a0a06a4fda29a3080ecef1a621f2bf60f (diff)
downloadmpv-d084f72a6cf47b9c232243398fced85c4c620ff6.tar.bz2
mpv-d084f72a6cf47b9c232243398fced85c4c620ff6.tar.xz
core: remove mp_fifo leftovers
Diffstat (limited to 'video')
-rw-r--r--video/out/cocoa_common.m1
-rw-r--r--video/out/vo.c1
-rw-r--r--video/out/vo.h1
3 files changed, 0 insertions, 3 deletions
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index dd166e03e1..dc95e537a1 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -31,7 +31,6 @@
#include "vo.h"
#include "aspect.h"
-#include "core/mp_fifo.h"
#include "talloc.h"
#include "core/mp_msg.h"
diff --git a/video/out/vo.c b/video/out/vo.c
index 44e963984c..e05b1ae8a6 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -292,7 +292,6 @@ struct vo *init_best_video_out(struct mp_vo_opts *opts,
struct vo *vo = talloc_ptrtype(NULL, vo);
struct vo initial_values = {
.opts = opts,
- .key_fifo = (struct mp_fifo *)input_ctx,
.encode_lavc_ctx = encode_lavc_ctx,
.input_ctx = input_ctx,
.event_fd = -1,
diff --git a/video/out/vo.h b/video/out/vo.h
index 611f7ec6f3..3eb9f940ea 100644
--- a/video/out/vo.h
+++ b/video/out/vo.h
@@ -262,7 +262,6 @@ struct vo {
struct vo_w32_state *w32;
struct vo_cocoa_state *cocoa;
struct vo_wayland_state *wayland;
- struct mp_fifo *key_fifo;
struct encode_lavc_context *encode_lavc_ctx;
struct input_ctx *input_ctx;
int event_fd; // check_events() should be called when this has input