summaryrefslogtreecommitdiffstats
path: root/libvo/vo_svga.c
diff options
context:
space:
mode:
authorse7encode <se7encode@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-04-17 19:05:59 +0000
committerse7encode <se7encode@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-04-17 19:05:59 +0000
commita62546848ee735eb0250a4b39e6421aa7b48c6eb (patch)
treea8b29be6f009ccc490ed6c53cc7b44b12eb1ff13 /libvo/vo_svga.c
parent37dc69e96510dcd0a23e09f05d245a3a4e3b9b58 (diff)
downloadmpv-a62546848ee735eb0250a4b39e6421aa7b48c6eb.tar.bz2
mpv-a62546848ee735eb0250a4b39e6421aa7b48c6eb.tar.xz
Thanx to Arpi, There is no more YUY2 bug.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@489 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_svga.c')
-rw-r--r--libvo/vo_svga.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/libvo/vo_svga.c b/libvo/vo_svga.c
index e92ccbeb55..5e2262ef92 100644
--- a/libvo/vo_svga.c
+++ b/libvo/vo_svga.c
@@ -350,34 +350,34 @@ static uint32_t query_format(uint32_t format) {
// if (vo_dbpp) => There is NO conversion!!!
if (vo_dbpp) {
switch (vo_dbpp) {
- case 32: if ((format == IMGFMT_RGB32) || (format == IMGFMT_BGR|32))
+ case 32: if ((format == IMGFMT_RGB32) || (format == IMGFMT_BGR32))
return ((bpp_avail & BPP_32) ? 1 : 0);
break;
- case 24: if ((format == IMGFMT_RGB24) || (format == IMGFMT_BGR|24))
+ case 24: if ((format == IMGFMT_RGB24) || (format == IMGFMT_BGR24))
return ((bpp_avail & BPP_24) ? 1 : 0);
break;
- case 16: if ((format == IMGFMT_RGB16) || (format == IMGFMT_BGR|16))
+ case 16: if ((format == IMGFMT_RGB16) || (format == IMGFMT_BGR16))
return ((bpp_avail & BPP_16) ? 1 : 0);
break;
- case 15: if ((format == IMGFMT_RGB15) || (format == IMGFMT_BGR|15))
+ case 15: if ((format == IMGFMT_RGB15) || (format == IMGFMT_BGR15))
return ((bpp_avail & BPP_15) ? 1 : 0);
break;
}
- } else
+ } else {
switch (format) {
case IMGFMT_RGB32:
- case IMGFMT_BGR|32: return ((bpp_avail & BPP_32) ? 1 : 0); break;
+ case IMGFMT_BGR32: return ((bpp_avail & BPP_32) ? 1 : 0); break;
case IMGFMT_RGB24:
- case IMGFMT_BGR|24: {
+ case IMGFMT_BGR24: {
res = (bpp_avail & BPP_24) ? 1 : 0;
if (!res)
res = (bpp_avail & BPP_32) ? 1 : 0;
return (res);
} break;
case IMGFMT_RGB16:
- case IMGFMT_BGR|16: return ((bpp_avail & BPP_16) ? 1 : 0); break;
+ case IMGFMT_BGR16: return ((bpp_avail & BPP_16) ? 1 : 0); break;
case IMGFMT_RGB15:
- case IMGFMT_BGR|15: {
+ case IMGFMT_BGR15: {
res = (bpp_avail & BPP_15) ? 1 : 0;
if (!res)
res = (bpp_avail & BPP_16) ? 1 : 0;
@@ -385,6 +385,7 @@ static uint32_t query_format(uint32_t format) {
} break;
case IMGFMT_YV12: return (1); break;
}
+ }
return (0);
}