opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-01 21:48:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

x11grab: replace undocumented nomouse hackery with a private option.

Browse Source
This commit is contained in:
Anton Khirnov
2011-06-20 12:42:36 +02:00
parent 8c28e01d31
commit ce558c8f59
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavdevice/x11grab.c
View File

@ -70,7 +70,7 @@ struct x11_grab
XImage *image; /**< X11 image holding the grab */ XImage *image; /**< X11 image holding the grab */
int use_shm; /**< !0 when using XShm extension */ int use_shm; /**< !0 when using XShm extension */
XShmSegmentInfo shminfo; /**< When using XShm, keeps track of XShm infos */ XShmSegmentInfo shminfo; /**< When using XShm, keeps track of XShm infos */
int nomouse; int draw_mouse; /**< Set by a private option. */
char *framerate; /**< Set by a private option. */ char *framerate; /**< Set by a private option. */
}; };
@ -104,7 +104,7 @@ x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
offset = strchr(param, '+'); offset = strchr(param, '+');
if (offset) { if (offset) {
sscanf(offset, "%d,%d", &x_off, &y_off); sscanf(offset, "%d,%d", &x_off, &y_off);
x11grab->nomouse= strstr(offset, "nomouse"); x11grab->draw_mouse = !strstr(offset, "nomouse");
*offset= 0; *offset= 0;
} }
@ -410,7 +410,7 @@ x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
} }
} }
if(!s->nomouse){ if (s->draw_mouse) {
paint_mouse_pointer(image, s); paint_mouse_pointer(image, s);
} }
@ -451,6 +451,7 @@ x11grab_read_close(AVFormatContext *s1)
static const AVOption options[] = { static const AVOption options[] = {
{ "video_size", "A string describing frame size, such as 640x480 or hd720.", OFFSET(video_size), FF_OPT_TYPE_STRING, {.str = "vga"}, 0, 0, DEC }, { "video_size", "A string describing frame size, such as 640x480 or hd720.", OFFSET(video_size), FF_OPT_TYPE_STRING, {.str = "vga"}, 0, 0, DEC },
{ "framerate", "", OFFSET(framerate), FF_OPT_TYPE_STRING, {.str = "ntsc"}, 0, 0, DEC }, { "framerate", "", OFFSET(framerate), FF_OPT_TYPE_STRING, {.str = "ntsc"}, 0, 0, DEC },
{ "draw_mouse", "Draw the mouse pointer.", OFFSET(draw_mouse), FF_OPT_TYPE_INT, { 1 }, 0, 1, DEC },
{ NULL }, { NULL },
}; };