diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 00:17:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 00:17:36 +0100 |
| commit | 8a776726457ad20afc4e7cf9115b309034dd0f25 (patch) | |
| tree | cc0ec090115aa63dfc90ab4cffcbd59907b92578 | |
| parent | 7fce8c752d87ca4738179bb7e9238bae67abdeac (diff) | |
| parent | 802987f8c7033ec8b82b35438d3822cf7f761166 (diff) | |
| download | ffmpeg-8a776726457ad20afc4e7cf9115b309034dd0f25.tar.gz | |
Merge commit '802987f8c7033ec8b82b35438d3822cf7f761166'
* commit '802987f8c7033ec8b82b35438d3822cf7f761166':
x11grab: Unbreak building
Conflicts:
libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavdevice/x11grab.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c index 8a18830be0..be883da005 100644 --- a/libavdevice/x11grab.c +++ b/libavdevice/x11grab.c @@ -657,8 +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 }, + { "grab_x", "Initial x coordinate.", OFFSET(x_off), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, DEC }, + { "grab_y", "Initial y coordinate.", OFFSET(y_off), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, DEC }, { "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", |