On 04/02/15 04:57, Sean McGovern wrote: > From: Michael Niedermayer <[email protected]> > > Fixes CID1254668 > > Signed-off-by: Michael Niedermayer <[email protected]> > > Conflicts: > libavdevice/xcbgrab.c > --- > libavdevice/xcbgrab.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/libavdevice/xcbgrab.c b/libavdevice/xcbgrab.c > index d56c286..59c1c63 100644 > --- a/libavdevice/xcbgrab.c > +++ b/libavdevice/xcbgrab.c > @@ -105,13 +105,14 @@ static int xcbgrab_reposition(AVFormatContext *s, > xcb_get_geometry_reply_t *geo) > { > XCBGrabContext *c = s->priv_data; > - int x = c->x, y = c->y; > + int x, y, p_x, p_y; > int w = c->width, h = c->height, f = c->follow_mouse; > - int p_x, p_y; > > if (!p || !geo) > return AVERROR(EIO); > > + x = c->x; > + y = c->y; > p_x = p->win_x; > p_y = p->win_y; > >
The context should be always set, the patch looks strange. lu _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
