[MPlayer-users] mplayer cvs -vo fbdev crashing since revision 1.76
Mark Zealey
mark at zealos.org
Wed Jan 8 19:59:08 CET 2003
D'oh! attached this time....
On Wed, Jan 08, 2003 at 06:49:59PM +0000, Mark Zealey wrote:
> [Automatic answer: RTFM (read DOCS, FAQ), also read DOCS/bugreports.html]
> Oops - was assuming the pointers would be initialized anyway. Fixed patch should
> apply clean and fix it (untested, just recompiling and then i'll test and
> commit)
>
> --
>
> Mark Zealey (aka JALH on irc.oftc.net: #zealos and many more)
> mark at zealos.org; mark at itsolve.co.uk
>
> UL++++>$ G!>(GCM/GCS/GS/GM) dpu? s:-@ a17! C++++>$ P++++>+++++$ L+++>+++++$
> !E---? W+++>$ !w--- r++ !t---?@ !X---? !R- !tv b+ G+++ e>+++++ !h++* r!-- y
>
> _______________________________________________
> RTFM!!! http://www.MPlayerHQ.hu/DOCS
> Search: http://www.MPlayerHQ.hu/cgi-bin/htsearch
> http://mplayerhq.hu/mailman/listinfo/mplayer-users
--
Mark Zealey (aka JALH on irc.oftc.net: #zealos and many more)
mark at zealos.org; mark at itsolve.co.uk
UL++++>$ G!>(GCM/GCS/GS/GM) dpu? s:-@ a17! C++++>$ P++++>+++++$ L+++>+++++$
!E---? W+++>$ !w--- r++ !t---?@ !X---? !R- !tv b+ G+++ e>+++++ !h++* r!-- y
-------------- next part --------------
--- mplayer/libvo/geometry.c Wed Jan 8 18:44:26 2003
+++ mplayerw/libvo/geometry.c Wed Jan 8 18:47:15 2003
@@ -35,22 +35,21 @@
sscanf(vo_geometry, "%i%%:%i%%", &xper, &yper) != 2 &&
sscanf(vo_geometry, "%i%%", &xper) != 1)
return geometry_error();
- }
-
- if(xper >= 0 && xper <= 100) xoff = (scrw - vidw) * ((float)xper / 100.0);
- if(yper >= 0 && yper <= 100) yoff = (scrh - vidh) * ((float)yper / 100.0);
- /* FIXME: better checking of bounds... */
- if(width < 0 || width > scrw) width = vidw;
- if(height < 0 || height > scrh) height = vidh;
- if(xoff < 0 || xoff + vidw > scrw) xoff = 0;
- if(yoff < 0 || yoff + vidh > scrh) yoff = 0;
+ if(xper >= 0 && xper <= 100) xoff = (scrw - vidw) * ((float)xper / 100.0);
+ if(yper >= 0 && yper <= 100) yoff = (scrh - vidh) * ((float)yper / 100.0);
- if(xpos) *xpos = xoff;
- if(ypos) *ypos = yoff;
- if(pwidth) *pwidth = width;
- if(pheight) *pheight = height;
+ /* FIXME: better checking of bounds... */
+ if(width < 0 || width > scrw) width = vidw;
+ if(height < 0 || height > scrh) height = vidh;
+ if(xoff < 0 || xoff + vidw > scrw) xoff = 0;
+ if(yoff < 0 || yoff + vidh > scrh) yoff = 0;
+ if(xpos) *xpos = xoff;
+ if(ypos) *ypos = yoff;
+ if(pwidth) *pwidth = width;
+ if(pheight) *pheight = height;
+ }
return 1;
}
More information about the MPlayer-users
mailing list