Mercurial > mplayer.hg
changeset 32027:b6cfb1f15a5b
mga: disable g200 support
g200 should use the swscale interface to convert to nv12. If anyone still uses
such a card and is willing to test, just let me know.
| author | ramiro |
|---|---|
| date | Thu, 09 Sep 2010 14:50:51 +0000 |
| parents | fe0a39657851 |
| children | 9e6fdede8ece |
| files | libvo/mga_template.c |
| diffstat | 1 files changed, 3 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/mga_template.c Thu Sep 09 10:42:01 2010 +0000 +++ b/libvo/mga_template.c Thu Sep 09 14:50:51 2010 +0000 @@ -19,7 +19,6 @@ #include "fastmemcpy.h" #include "cpudetect.h" #include "libswscale/swscale.h" -#include "libswscale/rgb2rgb.h" #include "libmpcodecs/vf_scale.h" #include "mp_msg.h" #include "help_mp.h" @@ -67,7 +66,7 @@ } -#ifdef CONFIG_LIBSWSCALE_A +#if 0 // Should use libswscale's interface to NV12 static void draw_slice_g200(uint8_t *image[], int stride[], int width,int height,int x,int y) { @@ -128,7 +127,7 @@ w,h,x,y); #endif -#ifdef CONFIG_LIBSWSCALE_A +#if 0 if (mga_vid_config.card_type == MGA_G200) draw_slice_g200(src,stride,w,h,x,y); else @@ -433,12 +432,10 @@ return -1; } } -#ifndef CONFIG_LIBSWSCALE_A if (mga_vid_config.card_type == MGA_G200) { - mp_msg(MSGT_VO, MSGL_FATAL, "G200 cards are only support with static libswscale\n"); + mp_msg(MSGT_VO, MSGL_FATAL, "G200 cards support is currently broken. patches welcome.\n"); return -1; } -#endif mp_msg(MSGT_VO,MSGL_V,"[MGA] Using %d buffers.\n",mga_vid_config.num_frames); @@ -473,7 +470,6 @@ { uint32_t ver; const char *devname=vo_subdevice?vo_subdevice:"/dev/mga_vid"; - sws_rgb2rgb_init(get_sws_cpuflags()); f = open(devname,O_RDWR); if(f == -1)