summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPetri Hintukainen <phintuka@users.sourceforge.net>2014-04-30 15:31:24 +0300
committerPetri Hintukainen <phintuka@users.sourceforge.net>2014-04-30 15:31:24 +0300
commit849000ac83649822fc7c8e9389cd096dd6feee27 (patch)
tree49a5180d33971215d7ff9ac74ff3901e83fcaf95 /src
parent716f7a09c0067be4275b6094fe5e38510c0e8317 (diff)
downloadxine-lib-849000ac83649822fc7c8e9389cd096dd6feee27.tar.gz
xine-lib-849000ac83649822fc7c8e9389cd096dd6feee27.tar.bz2
video_out_fb: make palette setup failure non-fatal with 24/32 bit RGB modes
Fixes fb video out with recent Ubuntu.
Diffstat (limited to 'src')
-rw-r--r--src/video_out/video_out_fb.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c
index bba1e0b8b..bcbc8237f 100644
--- a/src/video_out/video_out_fb.c
+++ b/src/video_out/video_out_fb.c
@@ -984,7 +984,9 @@ static vo_driver_t *fb_open_plugin(video_driver_class_t *class_gen,
if (!set_fb_palette (this->fd, &this->fb_var)) {
xprintf(this->xine, XINE_VERBOSITY_LOG, "video_out_fb: set_fb_palette() failed: %s\n", strerror(errno));
- goto error;
+ if (this->fb_var.bits_per_pixel < 24) {
+ goto error;
+ }
}
this->xine = class->xine;