diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-31 02:01:12 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-31 02:05:37 +0200 |
| commit | 1872284cdc75c6239e7739246d514c19684e5d85 (patch) | |
| tree | 810f74a777eb98d6b6221c57e17f7e11dcaea033 /libvo | |
| parent | 8c225fbe0dffc1e0dbaa2e9d4855761e66b020ab (diff) | |
| download | mpv-1872284cdc75c6239e7739246d514c19684e5d85.tar.bz2 mpv-1872284cdc75c6239e7739246d514c19684e5d85.tar.xz | |
VO: remove directfb from autoselected VOs
VO_directfb can call exit() if initialization fails. This makes
MPlayer exit without cleanup if autoselection tries it. This can be
seen for example by running something like this in an X terminal:
DISPLAY=foo mplayer file.mkv
The easiest fix for this is to remove directdb from the list of
autoselected VOs. The console VOs have enough problems that people who
want to use them should know what they're doing anyway.
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/video_out.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c index 9dbe490037..f8d857dfc5 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -232,9 +232,6 @@ const struct vo_driver *video_out_drivers[] = #ifdef CONFIG_VESA &video_out_vesa, #endif -#ifdef CONFIG_DIRECTFB - &video_out_directfb, -#endif #ifdef CONFIG_DFBMGA &video_out_dfbmga, #endif @@ -249,6 +246,10 @@ const struct vo_driver *video_out_drivers[] = #endif &video_out_null, // should not be auto-selected +#ifdef CONFIG_DIRECTFB + // vo directfb can call exit() if initialization fails + &video_out_directfb, +#endif #if CONFIG_XVMC &video_out_xvmc, #endif |