diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-25 01:12:50 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-25 01:12:50 +0100 |
commit | 2fbdf30efe994a9956a27d845010b57a5fc1deeb (patch) | |
tree | 4f7577ac1a6c527c9d6744755490167f142ddece /libavdevice/x11grab.c | |
parent | 53dd75e91154100a83b11f6ef9dfd15d79bcc3aa (diff) | |
parent | b31328d008985f87f0a7c83c700847cef1a4f08c (diff) |
Merge commit 'b31328d008985f87f0a7c83c700847cef1a4f08c'
* commit 'b31328d008985f87f0a7c83c700847cef1a4f08c':
xcbgrab: Provide better names for the y and x option
Conflicts:
doc/indevs.texi
libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/x11grab.c')
-rw-r--r-- | libavdevice/x11grab.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c index 3a833eb27f..8a18830be0 100644 --- a/libavdevice/x11grab.c +++ b/libavdevice/x11grab.c @@ -657,6 +657,8 @@ static int x11grab_read_close(AVFormatContext *s1) #define OFFSET(x) offsetof(X11GrabContext, x) #define DEC AV_OPT_FLAG_DECODING_PARAM static const AVOption options[] = { + { "grab_x", "Initial x coordinate.", OFFSET(x_off), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, D }, + { "grab_y", "Initial y coordinate.", OFFSET(y_off), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, D }, { "draw_mouse", "draw the mouse pointer", OFFSET(draw_mouse), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, DEC }, { "follow_mouse", "move the grabbing region when the mouse pointer reaches within specified amount of pixels to the edge of region", |