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

token: Fix bug when creating empty token

Browse source 
We always want to have a valid GstStructure in the token.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=710520
This commit is contained in:
Sebastian Rasmussen 2013-10-19 19:21:53 +02:00 committed by Wim Taymans
parent c4ae13dbb5
commit c9025a58e1
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gst/rtsp-server/rtsp-token.c
View file

@ -105,7 +105,16 @@ gst_rtsp_token_init (GstRTSPTokenImpl * token, GstStructure * structure)
GstRTSPToken * GstRTSPToken *
gst_rtsp_token_new_empty (void) gst_rtsp_token_new_empty (void)
{ {
return gst_rtsp_token_new (NULL, NULL); GstRTSPTokenImpl *token;
GstStructure *s;
s = gst_structure_new_empty ("GstRTSPToken");
g_return_val_if_fail (s != NULL, NULL);
token = g_slice_new0 (GstRTSPTokenImpl);
gst_rtsp_token_init (token, s);
return (GstRTSPToken *) token;
} }
/** /**
@ -144,18 +153,16 @@ gst_rtsp_token_new (const gchar * firstfield, ...)
GstRTSPToken * GstRTSPToken *
gst_rtsp_token_new_valist (const gchar * firstfield, va_list var_args) gst_rtsp_token_new_valist (const gchar * firstfield, va_list var_args)
{ {
GstRTSPTokenImpl *token; GstRTSPToken *token;
GstStructure *s; GstStructure *s;
g_return_val_if_fail (firstfield != NULL, NULL); g_return_val_if_fail (firstfield != NULL, NULL);
s = gst_structure_new_valist ("GstRTSPToken", firstfield, var_args); token = gst_rtsp_token_new_empty ();
g_return_val_if_fail (s != NULL, NULL); s = GST_RTSP_TOKEN_STRUCTURE (token);
gst_structure_set_valist (s, firstfield, var_args);
token = g_slice_new0 (GstRTSPTokenImpl); return token;
gst_rtsp_token_init (token, s);
return (GstRTSPToken *) token;
} }