summaryrefslogtreecommitdiffstats
path: root/video/out/vo.c
diff options
context:
space:
mode:
authorDiogo Franco (Kovensky) <diogomfranco@gmail.com>2015-04-25 18:28:17 +0900
committerDiogo Franco (Kovensky) <diogomfranco@gmail.com>2015-04-25 18:28:17 +0900
commit5f1d6b6e5ae515abfb77c78c44d21ee21beb0fc3 (patch)
tree6b757d37d296709dfd5955ef9d4d41426cd47da6 /video/out/vo.c
parentd64ff3aa51b49451348383a6ff6de7697a52dc62 (diff)
parent983d24e3b9ce9c9c7755279138c14170e85fbf37 (diff)
downloadmpv-5f1d6b6e5ae515abfb77c78c44d21ee21beb0fc3.tar.bz2
mpv-5f1d6b6e5ae515abfb77c78c44d21ee21beb0fc3.tar.xz
Merge branch 'master' into release/0.9
* master: (87 commits) manpage: move --autosync description player: add --window-scale option player: flush decoder even if cover art is decoded player: don't show A/V desync message in non-sense situations w32_common: add more rounded-down frame rates w32_common: use the current monitor's refresh rate dxva2: fix broken build with gcc 5.1 terminal: printf() is not signal-safe man: fix PDF build DOCS/mplayer-changes: Eleborate on joystick input osc: add nil check for element.eventresponder mp_image: remove some unused interlacing flags vf_vapoursynth: update _FieldBased semantics options: remove unneeded hack from command line parser manpage: document ff-index sub-property demux_mkv: limit timestamp fixing to 1ms max demux_mkv: attempt to fix rounded timestamps demux_mkv: move global options to the demuxer demux_mkv: better seeking after video end lua: add utils.format_json() function ...
Diffstat (limited to 'video/out/vo.c')
-rw-r--r--video/out/vo.c50
1 files changed, 27 insertions, 23 deletions
diff --git a/video/out/vo.c b/video/out/vo.c
index 4600205cb7..70f682263e 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -57,6 +57,7 @@ extern const struct vo_driver video_out_null;
extern const struct vo_driver video_out_image;
extern const struct vo_driver video_out_lavc;
extern const struct vo_driver video_out_caca;
+extern const struct vo_driver video_out_drm;
extern const struct vo_driver video_out_direct3d;
extern const struct vo_driver video_out_direct3d_shaders;
extern const struct vo_driver video_out_sdl;
@@ -67,47 +68,50 @@ extern const struct vo_driver video_out_rpi;
const struct vo_driver *const video_out_drivers[] =
{
#if HAVE_RPI
- &video_out_rpi,
+ &video_out_rpi,
#endif
#if HAVE_GL
- &video_out_opengl,
+ &video_out_opengl,
#endif
#if HAVE_VDPAU
- &video_out_vdpau,
+ &video_out_vdpau,
#endif
#if HAVE_DIRECT3D
- &video_out_direct3d_shaders,
- &video_out_direct3d,
+ &video_out_direct3d_shaders,
+ &video_out_direct3d,
#endif
#if HAVE_XV
- &video_out_xv,
+ &video_out_xv,
#endif
#if HAVE_SDL2
- &video_out_sdl,
+ &video_out_sdl,
#endif
#if HAVE_VAAPI
- &video_out_vaapi,
+ &video_out_vaapi,
#endif
#if HAVE_X11
- &video_out_x11,
+ &video_out_x11,
#endif
- &video_out_null,
- // should not be auto-selected
- &video_out_image,
+ &video_out_null,
+ // should not be auto-selected
+ &video_out_image,
#if HAVE_CACA
- &video_out_caca,
+ &video_out_caca,
+#endif
+#if HAVE_DRM
+ &video_out_drm,
#endif
#if HAVE_ENCODING
- &video_out_lavc,
+ &video_out_lavc,
#endif
#if HAVE_GL
- &video_out_opengl_hq,
- &video_out_opengl_cb,
+ &video_out_opengl_hq,
+ &video_out_opengl_cb,
#endif
#if HAVE_WAYLAND
- &video_out_wayland,
+ &video_out_wayland,
#endif
- NULL
+ NULL
};
struct vo_internal {
@@ -751,7 +755,7 @@ static void *vo_thread(void *ptr)
return NULL;
update_display_fps(vo);
- vo_event(vo, VO_WIN_STATE_MINIMIZED);
+ vo_event(vo, VO_EVENT_WIN_STATE);
while (1) {
mp_dispatch_queue_process(vo->in->dispatch, 0);
@@ -983,10 +987,10 @@ struct mp_image *vo_get_current_frame(struct vo *vo)
return r;
}
-/**
- * \brief lookup an integer in a table, table must have 0 as the last key
- * \param key key to search for
- * \result translation corresponding to key or "to" value of last mapping
+/*
+ * lookup an integer in a table, table must have 0 as the last key
+ * param: key key to search for
+ * returns translation corresponding to key or "to" value of last mapping
* if not found.
*/
int lookup_keymap_table(const struct mp_keymap *map, int key)