mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-11 18:05:37 +00:00
v4l2, ximagesrc: fix some printf format compiler warnings
https://bugzilla.gnome.org/show_bug.cgi?id=660150
This commit is contained in:
parent
a4154e9db2
commit
73fac4e5bc
2 changed files with 10 additions and 9 deletions
|
@ -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 {
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue