From fa4f7b17bc120effb82874538d895da1c92ba886 Mon Sep 17 00:00:00 2001 From: Lukasz Marek Date: Fri, 2 May 2014 17:52:57 +0200 Subject: lavd/xv: reident after previous commits Signed-off-by: Lukasz Marek --- libavdevice/xv.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'libavdevice') diff --git a/libavdevice/xv.c b/libavdevice/xv.c index 7353310892..d1f8907d99 100644 --- a/libavdevice/xv.c +++ b/libavdevice/xv.c @@ -145,19 +145,18 @@ static int xv_write_header(AVFormatContext *s) } } if (!xv->window_id) { - //TODO: reident - xv->window = XCreateSimpleWindow(xv->display, DefaultRootWindow(xv->display), - xv->window_x, xv->window_y, - xv->window_width, xv->window_height, - 0, 0, 0); - if (!xv->window_title) { - if (!(xv->window_title = av_strdup(s->filename))) { - ret = AVERROR(ENOMEM); - goto fail; + xv->window = XCreateSimpleWindow(xv->display, DefaultRootWindow(xv->display), + xv->window_x, xv->window_y, + xv->window_width, xv->window_height, + 0, 0, 0); + if (!xv->window_title) { + if (!(xv->window_title = av_strdup(s->filename))) { + ret = AVERROR(ENOMEM); + goto fail; + } } - } - XStoreName(xv->display, xv->window, xv->window_title); - XMapWindow(xv->display, xv->window); + XStoreName(xv->display, xv->window, xv->window_title); + XMapWindow(xv->display, xv->window); } else xv->window = xv->window_id; -- cgit v1.2.3