Mercurial > mplayer.hg
changeset 23060:91ad6d4d6a54
simplified depth definition
author | ben |
---|---|
date | Sun, 22 Apr 2007 15:44:42 +0000 |
parents | 7d3914646699 |
children | 66a03a5cf7b6 |
files | vidix/mach64_vid.c vidix/nvidia_vid.c vidix/pm2_vid.c vidix/pm3_vid.c vidix/radeon_vid.c vidix/savage_vid.c vidix/unichrome_vid.c |
diffstat | 7 files changed, 7 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/vidix/mach64_vid.c Sun Apr 22 15:41:17 2007 +0000 +++ b/vidix/mach64_vid.c Sun Apr 22 15:44:42 2007 +0000 @@ -881,11 +881,7 @@ { if(is_supported_fourcc(to->fourcc)) { - to->depth = VID_DEPTH_1BPP | VID_DEPTH_2BPP | - VID_DEPTH_4BPP | VID_DEPTH_8BPP | - VID_DEPTH_12BPP| VID_DEPTH_15BPP| - VID_DEPTH_16BPP| VID_DEPTH_24BPP| - VID_DEPTH_32BPP; + to->depth = VID_DEPTH_ALL; to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY; return 0; }
--- a/vidix/nvidia_vid.c Sun Apr 22 15:41:17 2007 +0000 +++ b/vidix/nvidia_vid.c Sun Apr 22 15:44:42 2007 +0000 @@ -985,11 +985,7 @@ static int nv_query_fourcc(vidix_fourcc_t *to){ if(is_supported_fourcc(to->fourcc)){ - to->depth = VID_DEPTH_1BPP | VID_DEPTH_2BPP | - VID_DEPTH_4BPP | VID_DEPTH_8BPP | - VID_DEPTH_12BPP| VID_DEPTH_15BPP| - VID_DEPTH_16BPP| VID_DEPTH_24BPP| - VID_DEPTH_32BPP; + to->depth = VID_DEPTH_ALL; to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY; return 0; }
--- a/vidix/pm2_vid.c Sun Apr 22 15:41:17 2007 +0000 +++ b/vidix/pm2_vid.c Sun Apr 22 15:44:42 2007 +0000 @@ -171,11 +171,7 @@ { if(is_supported_fourcc(to->fourcc)) { - to->depth = VID_DEPTH_1BPP | VID_DEPTH_2BPP | - VID_DEPTH_4BPP | VID_DEPTH_8BPP | - VID_DEPTH_12BPP| VID_DEPTH_15BPP| - VID_DEPTH_16BPP| VID_DEPTH_24BPP| - VID_DEPTH_32BPP; + to->depth = VID_DEPTH_ALL; to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY; return 0; }
--- a/vidix/pm3_vid.c Sun Apr 22 15:41:17 2007 +0000 +++ b/vidix/pm3_vid.c Sun Apr 22 15:44:42 2007 +0000 @@ -164,11 +164,7 @@ { if(is_supported_fourcc(to->fourcc)) { - to->depth = VID_DEPTH_1BPP | VID_DEPTH_2BPP | - VID_DEPTH_4BPP | VID_DEPTH_8BPP | - VID_DEPTH_12BPP| VID_DEPTH_15BPP| - VID_DEPTH_16BPP| VID_DEPTH_24BPP| - VID_DEPTH_32BPP; + to->depth = VID_DEPTH_ALL; to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY; return 0; }
--- a/vidix/radeon_vid.c Sun Apr 22 15:41:17 2007 +0000 +++ b/vidix/radeon_vid.c Sun Apr 22 15:44:42 2007 +0000 @@ -1474,11 +1474,7 @@ { if(is_supported_fourcc(to->fourcc)) { - to->depth = VID_DEPTH_1BPP | VID_DEPTH_2BPP | - VID_DEPTH_4BPP | VID_DEPTH_8BPP | - VID_DEPTH_12BPP| VID_DEPTH_15BPP| - VID_DEPTH_16BPP| VID_DEPTH_24BPP| - VID_DEPTH_32BPP; + to->depth = VID_DEPTH_ALL; to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY | VID_CAP_BLEND; return 0;
--- a/vidix/savage_vid.c Sun Apr 22 15:41:17 2007 +0000 +++ b/vidix/savage_vid.c Sun Apr 22 15:44:42 2007 +0000 @@ -1066,10 +1066,7 @@ { if (is_supported_fourcc (to->fourcc)) { - to->depth = VID_DEPTH_1BPP | VID_DEPTH_2BPP | - VID_DEPTH_4BPP | VID_DEPTH_8BPP | - VID_DEPTH_12BPP | VID_DEPTH_15BPP | - VID_DEPTH_16BPP | VID_DEPTH_24BPP | VID_DEPTH_32BPP; + to->depth = VID_DEPTH_ALL; to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY; return 0; }
--- a/vidix/unichrome_vid.c Sun Apr 22 15:41:17 2007 +0000 +++ b/vidix/unichrome_vid.c Sun Apr 22 15:44:42 2007 +0000 @@ -637,10 +637,7 @@ { if (is_supported_fourcc (to->fourcc)) { - to->depth = VID_DEPTH_1BPP | VID_DEPTH_2BPP | - VID_DEPTH_4BPP | VID_DEPTH_8BPP | - VID_DEPTH_12BPP | VID_DEPTH_15BPP | - VID_DEPTH_16BPP | VID_DEPTH_24BPP | VID_DEPTH_32BPP; + to->depth = VID_DEPTH_ALL; to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY; return 0; }