[FFmpeg-cvslog] lavd/xv: reident after previous commits
Lukasz Marek
git at videolan.org
Fri May 2 19:02:15 CEST 2014
ffmpeg | branch: master | Lukasz Marek <lukasz.m.luki2 at gmail.com> | Fri May 2 17:52:57 2014 +0200| [fa4f7b17bc120effb82874538d895da1c92ba886] | committer: Lukasz Marek
lavd/xv: reident after previous commits
Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa4f7b17bc120effb82874538d895da1c92ba886
---
libavdevice/xv.c | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/libavdevice/xv.c b/libavdevice/xv.c
index 7353310..d1f8907 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;
More information about the ffmpeg-cvslog
mailing list