Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
d40815a9
Commit
d40815a9
authored
10 years ago
by
Luca Barbato
Browse files
Options
Downloads
Patches
Plain Diff
xcbgrab: Correctly make shm optional
The segment field in the struct has to be conditionally build as well.
parent
c23ccaf9
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libavdevice/xcbgrab.c
+4
-4
4 additions, 4 deletions
libavdevice/xcbgrab.c
with
4 additions
and
4 deletions
libavdevice/xcbgrab.c
+
4
−
4
View file @
d40815a9
...
@@ -47,8 +47,9 @@ typedef struct XCBGrabContext {
...
@@ -47,8 +47,9 @@ typedef struct XCBGrabContext {
xcb_connection_t
*
conn
;
xcb_connection_t
*
conn
;
xcb_screen_t
*
screen
;
xcb_screen_t
*
screen
;
xcb_window_t
window
;
xcb_window_t
window
;
#if CONFIG_LIBXCB_SHM
xcb_shm_seg_t
segment
;
xcb_shm_seg_t
segment
;
#endif
int64_t
time_frame
;
int64_t
time_frame
;
AVRational
time_base
;
AVRational
time_base
;
...
@@ -614,8 +615,6 @@ static av_cold int xcbgrab_read_header(AVFormatContext *s)
...
@@ -614,8 +615,6 @@ static av_cold int xcbgrab_read_header(AVFormatContext *s)
return
AVERROR
(
EIO
);
return
AVERROR
(
EIO
);
}
}
c
->
segment
=
xcb_generate_id
(
c
->
conn
);
ret
=
create_stream
(
s
);
ret
=
create_stream
(
s
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
...
@@ -624,7 +623,8 @@ static av_cold int xcbgrab_read_header(AVFormatContext *s)
...
@@ -624,7 +623,8 @@ static av_cold int xcbgrab_read_header(AVFormatContext *s)
}
}
#if CONFIG_LIBXCB_SHM
#if CONFIG_LIBXCB_SHM
c
->
has_shm
=
check_shm
(
c
->
conn
);
if
((
c
->
has_shm
=
check_shm
(
c
->
conn
)))
c
->
segment
=
xcb_generate_id
(
c
->
conn
);
#endif
#endif
#if CONFIG_LIBXCB_XFIXES
#if CONFIG_LIBXCB_XFIXES
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment