RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

better fix for r23001, u_int becomes unsigned int, dont force it to uin32_t 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23055 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
ben 2007-04-21 11:59:30 +00:00
parent 9dbd459f7e
commit 911503efe6
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
vidix/pm2_vid.c
View File

@ -76,17 +76,17 @@ static vidix_capability_t pm2_cap =
{ 0, 0, 0, 0 }
};
static uint32_t pm2_card_ids[] =
static unsigned int pm2_card_ids[] =
{
(VENDOR_3DLABS << 16) | DEVICE_3DLABS_PERMEDIA2,
(VENDOR_TEXAS << 16) | DEVICE_TEXAS_TVP4020_PERMEDIA_2
};
static int find_chip(uint32_t vendor, uint32_t chip_id)
static int find_chip(unsigned int vendor, uint32_t chip_id)
{
uint32_t vci = (vendor << 16) | chip_id;
unsigned int vci = (vendor << 16) | chip_id;
unsigned i;
for(i = 0; i < sizeof(pm2_card_ids)/sizeof(uint32_t); i++){
for(i = 0; i < sizeof(pm2_card_ids)/sizeof(unsigned int); i++){
if(vci == pm2_card_ids[i]) return i;
}
return -1;
@ -186,7 +186,7 @@ static int pm2_query_fourcc(vidix_fourcc_t *to)
#define PPROD(a,b,c) (a | (b << 3) | (c << 6))
static uint32_t ppcodes[][2] = {
static unsigned int ppcodes[][2] = {
{0, 0},
{32, PPROD(1, 0, 0)},
{64, PPROD(1, 1, 0)},
@ -226,14 +226,14 @@ static int frames[VID_PLAY_MAXFRAMES];
static int pm2_config_playback(vidix_playback_t *info)
{
uint32_t src_w, drw_w;
uint32_t src_h, drw_h;
unsigned int src_w, drw_w;
unsigned int src_h, drw_h;
long base0;
uint32_t stride, sstr;
uint32_t format;
unsigned int stride, sstr;
unsigned int format;
unsigned int i;
uint32_t ppcode = 0, sppc = 0;
uint32_t pitch = 0;
unsigned int ppcode = 0, sppc = 0;
unsigned int pitch = 0;
TRACE_ENTER();