diff options
Diffstat (limited to 'libavdevice/x11grab.c')
| -rw-r--r-- | libavdevice/x11grab.c | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c index 0e63d09fea..090af4930f 100644 --- a/libavdevice/x11grab.c +++ b/libavdevice/x11grab.c @@ -1,9 +1,9 @@ /* * X11 video grab interface * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav integration: + * FFmpeg integration: * Copyright (C) 2006 Clemens Fruhwirth <clemens@endorphin.org> * Edouard Gomez <ed.gomez@free.fr> * @@ -14,18 +14,18 @@ * Copyright (C) 1997-1998 Rasca, Berlin * 2003-2004 Karl H. Beckers, Frankfurt * - * Libav is free software; you can redistribute it and/or modify + * FFmpeg is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Libav; if not, write to the Free Software + * along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -90,19 +90,20 @@ x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) int x_off = 0; int y_off = 0; int use_shm; - char *param, *offset; + char *dpyname, *offset; - param = av_strdup(s1->filename); - offset = strchr(param, '+'); + dpyname = av_strdup(s1->filename); + offset = strchr(dpyname, '+'); if (offset) { sscanf(offset, "%d,%d", &x_off, &y_off); x11grab->nomouse= strstr(offset, "nomouse"); *offset= 0; } - av_log(s1, AV_LOG_INFO, "device: %s -> display: %s x: %d y: %d width: %d height: %d\n", s1->filename, param, x_off, y_off, ap->width, ap->height); + av_log(s1, AV_LOG_INFO, "device: %s -> display: %s x: %d y: %d width: %d height: %d\n", s1->filename, dpyname, x_off, y_off, ap->width, ap->height); - dpy = XOpenDisplay(param); + dpy = XOpenDisplay(dpyname); + av_freep(&dpyname); if(!dpy) { av_log(s1, AV_LOG_ERROR, "Could not open X display.\n"); return AVERROR(EIO); @@ -120,7 +121,7 @@ x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) av_set_pts_info(st, 64, 1, 1000000); /* 64 bits pts in us */ use_shm = XShmQueryExtension(dpy); - av_log(s1, AV_LOG_INFO, "shared memory extension %s found\n", use_shm ? "" : "not"); + av_log(s1, AV_LOG_INFO, "shared memory extension%s found\n", use_shm ? "" : " not"); if(use_shm) { int scr = XDefaultScreen(dpy); @@ -384,10 +385,9 @@ x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt) nanosleep(&ts, NULL); } - if (av_new_packet(pkt, s->frame_size) < 0) { - return AVERROR(EIO); - } - + av_init_packet(pkt); + pkt->data = image->data; + pkt->size = s->frame_size; pkt->pts = curtime; if(s->use_shm) { @@ -404,9 +404,6 @@ x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt) paint_mouse_pointer(image, s); } - - /* XXX: avoid memcpy */ - memcpy(pkt->data, image->data, s->frame_size); return s->frame_size; } |