mirror of
https://github.com/mpv-player/mpv
synced 2025-02-18 22:06:59 +00:00
Thanx to Arpi, There is no more YUY2 bug.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@489 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
37dc69e965
commit
a62546848e
@ -350,34 +350,34 @@ static uint32_t query_format(uint32_t format) {
|
|||||||
// if (vo_dbpp) => There is NO conversion!!!
|
// if (vo_dbpp) => There is NO conversion!!!
|
||||||
if (vo_dbpp) {
|
if (vo_dbpp) {
|
||||||
switch (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);
|
return ((bpp_avail & BPP_32) ? 1 : 0);
|
||||||
break;
|
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);
|
return ((bpp_avail & BPP_24) ? 1 : 0);
|
||||||
break;
|
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);
|
return ((bpp_avail & BPP_16) ? 1 : 0);
|
||||||
break;
|
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);
|
return ((bpp_avail & BPP_15) ? 1 : 0);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} else
|
} else {
|
||||||
switch (format) {
|
switch (format) {
|
||||||
case IMGFMT_RGB32:
|
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_RGB24:
|
||||||
case IMGFMT_BGR|24: {
|
case IMGFMT_BGR24: {
|
||||||
res = (bpp_avail & BPP_24) ? 1 : 0;
|
res = (bpp_avail & BPP_24) ? 1 : 0;
|
||||||
if (!res)
|
if (!res)
|
||||||
res = (bpp_avail & BPP_32) ? 1 : 0;
|
res = (bpp_avail & BPP_32) ? 1 : 0;
|
||||||
return (res);
|
return (res);
|
||||||
} break;
|
} break;
|
||||||
case IMGFMT_RGB16:
|
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_RGB15:
|
||||||
case IMGFMT_BGR|15: {
|
case IMGFMT_BGR15: {
|
||||||
res = (bpp_avail & BPP_15) ? 1 : 0;
|
res = (bpp_avail & BPP_15) ? 1 : 0;
|
||||||
if (!res)
|
if (!res)
|
||||||
res = (bpp_avail & BPP_16) ? 1 : 0;
|
res = (bpp_avail & BPP_16) ? 1 : 0;
|
||||||
@ -385,6 +385,7 @@ static uint32_t query_format(uint32_t format) {
|
|||||||
} break;
|
} break;
|
||||||
case IMGFMT_YV12: return (1); break;
|
case IMGFMT_YV12: return (1); break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user