Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
ce558c8f
Commit
ce558c8f
authored
Jun 20, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x11grab: replace undocumented nomouse hackery with a private option.
parent
8c28e01d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
x11grab.c
libavdevice/x11grab.c
+4
-3
No files found.
libavdevice/x11grab.c
View file @
ce558c8f
...
@@ -70,7 +70,7 @@ struct x11_grab
...
@@ -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)
...
@@ -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)
...
@@ -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)
...
@@ -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
},
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment