mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-22 15:18:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

Header file fix (these ## are needed for multi-arguments) and a fix for gst_props_get() if safe = FALSE (we still nee...

Browse source 
Original commit message from CVS:
Header file fix (these ## are needed for multi-arguments) and a fix for gst_props_get() if safe = FALSE (we still need three arguments per fetch)
This commit is contained in:
Ronald S. Bultje 2002-05-03 09:34:07 +00:00
parent e6abe03293
commit 56bd6b1eb4
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/gstcaps.h
View file

@ -112,8 +112,8 @@ void gst_caps_set_type_id (GstCaps *caps, guint16 type_id);
GstCaps* gst_caps_set_props (GstCaps *caps, GstProps *props); GstCaps* gst_caps_set_props (GstCaps *caps, GstProps *props);
GstProps* gst_caps_get_props (GstCaps *caps); GstProps* gst_caps_get_props (GstCaps *caps);
#define gst_caps_set(caps, name, args...) gst_props_set ((caps)->properties, name, args) #define gst_caps_set(caps, name, args...) gst_props_set ((caps)->properties, name, ##args)
#define gst_caps_get(caps, name, args...) gst_props_get ((caps)->properties, name, args) #define gst_caps_get(caps, name, args...) gst_props_get ((caps)->properties, name, ##args)
#define gst_caps_get_int(caps,name,res) gst_props_entry_get_int(gst_props_get_entry((caps)->properties,name),res) #define gst_caps_get_int(caps,name,res) gst_props_entry_get_int(gst_props_get_entry((caps)->properties,name),res)
#define gst_caps_get_float(caps,name,res) gst_props_entry_get_float(gst_props_get_entry((caps)->properties,name),res) #define gst_caps_get_float(caps,name,res) gst_props_entry_get_float(gst_props_get_entry((caps)->properties,name),res)

3
gst/gstprops.c
View file

@ -193,10 +193,11 @@ G_STMT_START { \
#define GST_PROPS_ENTRY_READ(entry, var_args, safe, result) \ #define GST_PROPS_ENTRY_READ(entry, var_args, safe, result) \
G_STMT_START { \ G_STMT_START { \
GstPropsType propstype = va_arg (var_args, GstPropsType); \
\
*result = TRUE; \ *result = TRUE; \
\ \
if (safe) { \ if (safe) { \
GstPropsType propstype = va_arg (var_args, GstPropsType); \
if (propstype != entry->propstype) { \ if (propstype != entry->propstype) { \
*result = FALSE; \ *result = FALSE; \
} \ } \