diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-08-03 17:14:35 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-08-03 17:14:35 +0000 |
commit | 2824218de56fc1de57584c444e1bc0e1ec2d8412 (patch) | |
tree | 6135c8ffb80023543dccdaeac9d96fe3616b51cf | |
parent | dc0541c1426ea1a30a9a604c68ec6087ecec4217 (diff) |
add XVR-100 vo, patch by Balatoni Denes (dbalatoni interware hu)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24004 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-x | configure | 32 | ||||
-rw-r--r-- | libvo/video_out.c | 6 |
2 files changed, 38 insertions, 0 deletions
@@ -378,6 +378,7 @@ Video output: --enable-zr enable ZR360[56]7/ZR36060 video output [autodetect] --enable-bl enable Blinkenlights video output [disable] --enable-tdfxvid enable tdfx_vid video output [disable] + --enable-xvr100 enable SUN XVR-100 video output [autodetect] --disable-tga disable Targa video output [enable] --disable-pnm disable PNM video output [enable] --disable-md5sum disable md5sum video output [enable] @@ -622,6 +623,7 @@ _3dfx=no _s3fb=no _tdfxfb=no _tdfxvid=no +_xvr100=auto _tga=yes _directfb=auto _zr=auto @@ -1044,6 +1046,8 @@ for ac_option do --disable-tdfxfb) _tdfxfb=no ;; --disable-tdfxvid) _tdfxvid=no ;; --enable-tdfxvid) _tdfxvid=yes ;; + --disable-xvr100) _xvr100=no ;; + --enable-xvr100) _xvr100=yes ;; --disable-tga) _tga=no ;; --enable-tga) _tga=yes ;; --enable-directfb) _directfb=yes ;; @@ -3659,6 +3663,33 @@ else fi echores "$_tdfxvid" +echocheck "xvr100" +if test "$_xvr100" = auto ; then +cat > $TMPC << EOF +#include <unistd.h> +#include <sys/fbio.h> +#include <sys/visual_io.h> +int main(void) { +struct vis_identifier ident; +struct fbgattr attr; + +ioctl(0, VIS_GETIDENTIFIER, &ident); +ioctl(0, FBIOGATTR, &attr); +} +EOF + _xvr100=no + cc_check && _xvr100=yes +fi +if test "$_xvr100" = yes ; then + _def_xvr100='#define HAVE_XVR100 1' + _vosrc="$_vosrc vo_xvr100.c" + _vomodules="xvr100 $_vomodules" +else + _def_tdfxvid='#undef HAVE_XVR100' + _novomodules="xvr100 $_novomodules" +fi +echores "$_xvr100" + echocheck "tga" if test "$_tga" = yes ; then _def_tga='#define HAVE_TGA 1' @@ -8289,6 +8320,7 @@ $_def_3dfx $_def_s3fb $_def_tdfxfb $_def_tdfxvid +$_def_xvr100 $_def_directfb $_def_directfb_version $_def_dfbmga diff --git a/libvo/video_out.c b/libvo/video_out.c index 14899b82a5..5312c75e48 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -129,6 +129,9 @@ extern vo_functions_t video_out_cvidix; #ifdef HAVE_TDFX_VID extern vo_functions_t video_out_tdfx_vid; #endif +#ifdef HAVE_XVR100 +extern vo_functions_t video_out_xvr100; +#endif #ifdef HAVE_TGA extern vo_functions_t video_out_tga; #endif @@ -147,6 +150,9 @@ extern vo_functions_t video_out_md5sum; vo_functions_t* video_out_drivers[] = { +#ifdef HAVE_XVR100 + &video_out_xvr100, +#endif #ifdef HAVE_TDFX_VID &video_out_tdfx_vid, #endif |