Mercurial > mplayer.hg
changeset 10177:9cee07f898f7
swscaler doesn't recognizes support for BGR1/BGR4 too, and so if forced it crashes, without checking the swsContext
| author | alex |
|---|---|
| date | Fri, 23 May 2003 21:20:12 +0000 |
| parents | 69bb88bc869b |
| children | 7a08f6b5ce1b |
| files | libvo/vo_x11.c |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_x11.c Fri May 23 20:35:56 2003 +0000 +++ b/libvo/vo_x11.c Fri May 23 21:20:12 2003 +0000 @@ -398,6 +398,8 @@ /* always allocate swsContext as size could change between frames */ swsContext= sws_getContextFromCmdLine(width, height, in_format, width, height, out_format ); + if (!swsContext) + return -1; //printf( "X11 bpp: %d color mask: R:%lX G:%lX B:%lX\n",bpp,myximage->red_mask,myximage->green_mask,myximage->blue_mask ); @@ -565,7 +567,7 @@ mp_msg(MSGT_VO,MSGL_DBG2,"vo_x11: query_format was called: %x (%s)\n",format,vo_format_name(format)); if (IMGFMT_IS_BGR(format)) { - if (IMGFMT_BGR_DEPTH(format) == 8) + if (IMGFMT_BGR_DEPTH(format) <= 8) return 0; // TODO 8bpp not yet fully implemented if (IMGFMT_BGR_DEPTH(format) == vo_depthonscreen) return 3|VFCAP_OSD|VFCAP_SWSCALE|VFCAP_FLIP|VFCAP_ACCEPT_STRIDE;