summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-12-28 22:13:47 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-12-28 22:13:47 +0000
commit5818e1569f121a9a9a0b7dbb6e18c89ba2f1e69c (patch)
tree15be0f1664d106aeb6875d9ad3340a2204307c16
parentfa5be7cfc0d44f3f4f847dd7e595f781b21e3b09 (diff)
downloadxine-lib-5818e1569f121a9a9a0b7dbb6e18c89ba2f1e69c.tar.gz
xine-lib-5818e1569f121a9a9a0b7dbb6e18c89ba2f1e69c.tar.bz2
Add support for Xv "blitter" adaptors.
These are known to be present in some nvidia graphics hardware.
-rw-r--r--ChangeLog3
-rw-r--r--src/video_out/xv_common.h6
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 25527a13f..8e958b8de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@ xine-lib (1.1.16) 2008-??-??
* Fix some XCB Xv attribute configuration breakage.
* Add a configuration option for Xv bicubic filtering, implemented in
xf86-video-ati 6.9.1.
+ * Recognise Xv "blitter" adaptors for port selection purposes.
+ NOTE: you will need to remove ~/.xine/catalog.cache when upgrading from
+ xine-lib 1.1.15 or older if you wish to use this extra option.
xine-lib (1.1.15) 2008-08-14
* Security fixes:
diff --git a/src/video_out/xv_common.h b/src/video_out/xv_common.h
index ac16a333a..ff49286f0 100644
--- a/src/video_out/xv_common.h
+++ b/src/video_out/xv_common.h
@@ -63,12 +63,12 @@
#define VIDEO_DEVICE_XV_DECL_PREFER_TYPES \
typedef enum { \
- xv_prefer_none, xv_prefer_overlay, xv_prefer_textured, \
+ xv_prefer_none, xv_prefer_overlay, xv_prefer_textured, xv_prefer_blitter, \
} xv_prefertype; \
static const char *const prefer_labels[] = \
- { "Any", "Overlay", "Textured Video", NULL }; \
+ { "Any", "Overlay", "Textured Video", "Blitter", NULL }; \
static const char prefer_substrings[][8] = \
- { "", "Overlay", "Texture" };
+ { "", "Overlay", "Texture", "Blitter" };
#define VIDEO_DEVICE_XV_PREFER_TYPE_HELP \
_("video display method preference"), \
_("Selects which video output method is preferred. " \