diff options
| author | Lukasz Marek <lukasz.m.luki2@gmail.com> | 2014-05-02 17:52:57 +0200 |
|---|---|---|
| committer | Lukasz Marek <lukasz.m.luki2@gmail.com> | 2014-05-02 18:04:05 +0200 |
| commit | fa4f7b17bc120effb82874538d895da1c92ba886 (patch) | |
| tree | a734cd9c1c1ff5e3283c4f56198dec03132a48e8 | |
| parent | 330d547ef3cceb0a90b4db3bb0ea58d07dabe4d4 (diff) | |
| download | ffmpeg-fa4f7b17bc120effb82874538d895da1c92ba886.tar.gz | |
lavd/xv: reident after previous commits
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
| -rw-r--r-- | libavdevice/xv.c | 23 |
1 files changed, 11 insertions, 12 deletions
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; |