mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

[MOVED FROM GOOD] directdrawsink: Fix type mismatches

Browse source 
Fixes bug #573343.
This commit is contained in:
LRN 2009-02-27 20:40:31 +01:00 committed by Jan Schmidt
parent 3aafd4f9c3
commit 770c18986d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/directdraw/gstdirectdrawsink.c
View file

@ -610,7 +610,7 @@ gst_directdraw_sink_buffer_alloc (GstBaseSink * bsink, guint64 offset,
!gst_directdraw_sink_surface_check (ddrawsink, surface)) !gst_directdraw_sink_surface_check (ddrawsink, surface))
) { ) {
gst_directdraw_sink_surface_destroy (ddrawsink, surface); gst_directdraw_sink_surface_destroy (ddrawsink, surface);
gst_buffer_unref (surface); gst_buffer_unref (GST_BUFFER_CAST (surface));
surface = NULL; surface = NULL;
} else { } else {
/* We found a suitable surface */ /* We found a suitable surface */
@ -629,7 +629,7 @@ gst_directdraw_sink_buffer_alloc (GstBaseSink * bsink, guint64 offset,
DDSURFACEDESC2 surface_desc; DDSURFACEDESC2 surface_desc;
DDSURFACEDESC2 *sd; DDSURFACEDESC2 *sd;
if (!gst_structure_get_int (structure, "depth", &depth)) { if (!gst_structure_get_int (structure, "depth", (gint *) & depth)) {
GST_CAT_DEBUG_OBJECT (directdrawsink_debug, ddrawsink, GST_CAT_DEBUG_OBJECT (directdrawsink_debug, ddrawsink,
"Can't get depth from buffer_alloc caps"); "Can't get depth from buffer_alloc caps");
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
@ -663,7 +663,7 @@ gst_directdraw_sink_buffer_alloc (GstBaseSink * bsink, guint64 offset,
gint bpp, endianness, red_mask, green_mask, blue_mask; gint bpp, endianness, red_mask, green_mask, blue_mask;
/* get new display mode properties */ /* get new display mode properties */
gst_structure_get_int (display_structure, "depth", &depth); gst_structure_get_int (display_structure, "depth", (gint *) & depth);
gst_structure_get_int (display_structure, "bpp", &bpp); gst_structure_get_int (display_structure, "bpp", &bpp);
gst_structure_get_int (display_structure, "endianness", &endianness); gst_structure_get_int (display_structure, "endianness", &endianness);
gst_structure_get_int (display_structure, "red_mask", &red_mask); gst_structure_get_int (display_structure, "red_mask", &red_mask);
@ -997,7 +997,7 @@ gst_ddrawvideosink_get_format_from_caps (GstDirectDrawSink * ddrawsink,
pPixelFormat->dwBBitMask = GUINT32_TO_BE (pPixelFormat->dwBBitMask); pPixelFormat->dwBBitMask = GUINT32_TO_BE (pPixelFormat->dwBBitMask);
} }
} else if (gst_structure_has_name (structure, "video/x-raw-yuv")) { } else if (gst_structure_has_name (structure, "video/x-raw-yuv")) {
gint fourcc; guint32 fourcc;
pPixelFormat->dwFlags = DDPF_FOURCC; pPixelFormat->dwFlags = DDPF_FOURCC;
ret &= gst_structure_get_fourcc (structure, "format", &fourcc); ret &= gst_structure_get_fourcc (structure, "format", &fourcc);
@ -1894,7 +1894,7 @@ gst_directdraw_sink_bufferpool_clear (GstDirectDrawSink * ddrawsink)
ddrawsink->buffer_pool = g_slist_delete_link (ddrawsink->buffer_pool, ddrawsink->buffer_pool = g_slist_delete_link (ddrawsink->buffer_pool,
ddrawsink->buffer_pool); ddrawsink->buffer_pool);
gst_directdraw_sink_surface_destroy (ddrawsink, surface); gst_directdraw_sink_surface_destroy (ddrawsink, surface);
gst_buffer_unref (surface); gst_buffer_unref (GST_BUFFER_CAST (surface));
} }
g_mutex_unlock (ddrawsink->pool_lock); g_mutex_unlock (ddrawsink->pool_lock);
} }