diff options
author | Rudolf Polzer <divverent@xonotic.org> | 2012-09-14 17:51:26 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-09-18 21:08:20 +0200 |
commit | f5b8b6ac126d8cef3860db16d3db8e72507a2258 (patch) | |
tree | c86a6160cee076d3a632e4d3247e566e8c064390 /libvo/video_out.c | |
parent | 5617bf483e563aae22100c0ca1d8182f71d4f82d (diff) | |
download | mpv-f5b8b6ac126d8cef3860db16d3db8e72507a2258.tar.bz2 mpv-f5b8b6ac126d8cef3860db16d3db8e72507a2258.tar.xz |
encode: video encoding now supported using mencoder-like options
Diffstat (limited to 'libvo/video_out.c')
-rw-r--r-- | libvo/video_out.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c index 64b2a605c5..2be311f87c 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -78,6 +78,7 @@ extern struct vo_driver video_out_gl; extern struct vo_driver video_out_gl3; extern struct vo_driver video_out_null; extern struct vo_driver video_out_image; +extern struct vo_driver video_out_lavc; extern struct vo_driver video_out_caca; extern struct vo_driver video_out_direct3d; extern struct vo_driver video_out_direct3d_shaders; @@ -116,6 +117,9 @@ const struct vo_driver *video_out_drivers[] = &video_out_null, // should not be auto-selected &video_out_image, +#ifdef CONFIG_ENCODING + &video_out_lavc, +#endif #ifdef CONFIG_X11 #ifdef CONFIG_GL &video_out_gl_nosw, @@ -283,7 +287,8 @@ void list_video_out(void) struct vo *init_best_video_out(struct MPOpts *opts, struct mp_fifo *key_fifo, - struct input_ctx *input_ctx) + struct input_ctx *input_ctx, + struct encode_lavc_context *encode_lavc_ctx) { char **vo_list = opts->video_driver_list; int i; @@ -291,6 +296,7 @@ struct vo *init_best_video_out(struct MPOpts *opts, struct vo initial_values = { .opts = opts, .key_fifo = key_fifo, + .encode_lavc_ctx = encode_lavc_ctx, .input_ctx = input_ctx, .event_fd = -1, .registered_fd = -1, |