Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
George Kiagiadakis
gst-plugins-good
Commits
73fac4e5
Commit
73fac4e5
authored
Sep 29, 2011
by
Stas Sergeev
Committed by
Tim-Philipp Müller
Sep 30, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
v4l2, ximagesrc: fix some printf format compiler warnings
https://bugzilla.gnome.org/show_bug.cgi?id=660150
parent
a4154e9d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
9 deletions
+10
-9
sys/v4l2/gstv4l2object.c
sys/v4l2/gstv4l2object.c
+2
-2
sys/ximage/gstximagesrc.c
sys/ximage/gstximagesrc.c
+8
-7
No files found.
sys/v4l2/gstv4l2object.c
View file @
73fac4e5
...
...
@@ -704,8 +704,8 @@ gst_v4l2_set_defaults (GstV4l2Object * v4l2object)
if
(
v4l2object
->
tv_norm
)
norm
=
gst_v4l2_tuner_get_norm_by_std_id
(
v4l2object
,
v4l2object
->
tv_norm
);
GST_DEBUG_OBJECT
(
v4l2object
->
element
,
"tv_norm=
%d, norm=%p"
,
v4l2object
->
tv_norm
,
norm
);
GST_DEBUG_OBJECT
(
v4l2object
->
element
,
"tv_norm=
0x%"
G_GINT64_MODIFIER
"x, "
"norm=%p"
,
(
guint64
)
v4l2object
->
tv_norm
,
norm
);
if
(
norm
)
{
gst_tuner_set_norm
(
tuner
,
norm
);
}
else
{
...
...
sys/ximage/gstximagesrc.c
View file @
73fac4e5
...
...
@@ -165,11 +165,12 @@ gst_ximage_src_open_display (GstXImageSrc * s, const gchar * name)
if
(
s
->
xid
!=
0
)
{
status
=
XGetWindowAttributes
(
s
->
xcontext
->
disp
,
s
->
xid
,
&
attrs
);
if
(
status
)
{
GST_DEBUG_OBJECT
(
s
,
"Found window XID %
p
"
,
s
->
xid
);
GST_DEBUG_OBJECT
(
s
,
"Found window XID %"
G_GUINT64_FORMAT
,
s
->
xid
);
s
->
xwindow
=
s
->
xid
;
goto
window_found
;
}
else
{
GST_WARNING_OBJECT
(
s
,
"Failed to get window %p attributes"
,
s
->
xid
);
GST_WARNING_OBJECT
(
s
,
"Failed to get window %"
G_GUINT64_FORMAT
" attributes"
,
s
->
xid
);
}
}
...
...
@@ -177,13 +178,14 @@ gst_ximage_src_open_display (GstXImageSrc * s, const gchar * name)
GST_DEBUG_OBJECT
(
s
,
"Looking for window %s"
,
s
->
xname
);
window
=
gst_ximage_src_find_window
(
s
,
s
->
xcontext
->
root
,
s
->
xname
);
if
(
window
!=
0
)
{
GST_DEBUG_OBJECT
(
s
,
"Found window named %s
as %p
, "
,
s
->
xname
,
window
);
GST_DEBUG_OBJECT
(
s
,
"Found window named %s, "
,
s
->
xname
);
status
=
XGetWindowAttributes
(
s
->
xcontext
->
disp
,
window
,
&
attrs
);
if
(
status
)
{
s
->
xwindow
=
window
;
goto
window_found
;
}
else
{
GST_WARNING_OBJECT
(
s
,
"Failed to get window %p attributes"
,
window
);
GST_WARNING_OBJECT
(
s
,
"Failed to get window attributes for "
"window named %s"
,
s
->
xname
);
}
}
}
...
...
@@ -195,7 +197,7 @@ gst_ximage_src_open_display (GstXImageSrc * s, const gchar * name)
g_assert
(
s
->
xwindow
!=
0
);
s
->
width
=
attrs
.
width
;
s
->
height
=
attrs
.
height
;
GST_INFO_OBJECT
(
s
,
"Using default window
%p,
size of %dx%d"
,
s
->
xwindow
,
GST_INFO_OBJECT
(
s
,
"Using default window size of %dx%d"
,
s
->
width
,
s
->
height
);
}
use_root_window:
...
...
@@ -664,8 +666,7 @@ gst_ximage_src_ximage_get (GstXImageSrc * ximagesrc)
}
else
#endif
/* HAVE_XSHM */
{
GST_DEBUG_OBJECT
(
ximagesrc
,
"Retrieving screen using XGetImage, window %p"
,
ximagesrc
->
xwindow
);
GST_DEBUG_OBJECT
(
ximagesrc
,
"Retrieving screen using XGetImage"
);
if
(
ximagesrc
->
remote
)
{
XGetSubImage
(
ximagesrc
->
xcontext
->
disp
,
ximagesrc
->
xwindow
,
ximagesrc
->
startx
,
ximagesrc
->
starty
,
ximagesrc
->
width
,
...
...
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