`tsmux_stream_default_get_es_descrs` is missing the `user_data`
parameter and shouldn't be cast to `TsMuxStreamGetESDescriptorsFunc`.
Prefer not casting at all to make sure we don't miss such an issue.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5516>
}
tsmux_stream_set_get_es_descriptors_func (ret,
}
tsmux_stream_set_get_es_descriptors_func (ret,
- (TsMuxStreamGetESDescriptorsFunc) gst_atsc_mux_stream_get_es_descrs,
- user_data);
+ gst_atsc_mux_stream_get_es_descrs, user_data);
+static void
+tsmux_stream_get_es_descrs_default (TsMuxStream * stream,
+ GstMpegtsPMTStream * pmt_stream, gpointer user_data)
+{
+ tsmux_stream_default_get_es_descrs (stream, pmt_stream);
+}
+
/**
* tsmux_stream_new:
* @pid: a PID
/**
* tsmux_stream_new:
* @pid: a PID
stream->pcr_ref = 0;
stream->next_pcr = -1;
stream->pcr_ref = 0;
stream->next_pcr = -1;
- stream->get_es_descrs =
- (TsMuxStreamGetESDescriptorsFunc) tsmux_stream_default_get_es_descrs;
+ stream->get_es_descrs = tsmux_stream_get_es_descrs_default;
stream->get_es_descrs_data = NULL;
return stream;
stream->get_es_descrs_data = NULL;
return stream;
typedef struct TsMuxStreamBuffer TsMuxStreamBuffer;
typedef void (*TsMuxStreamBufferReleaseFunc) (guint8 *data, void *user_data);
typedef struct TsMuxStreamBuffer TsMuxStreamBuffer;
typedef void (*TsMuxStreamBufferReleaseFunc) (guint8 *data, void *user_data);
-typedef void (*TsMuxStreamGetESDescriptorsFunc) (TsMuxStream *stream, GstMpegtsPMTStream *pmt_stream, void *user_data);
+typedef void (*TsMuxStreamGetESDescriptorsFunc) (TsMuxStream *stream, GstMpegtsPMTStream *pmt_stream, gpointer user_data);
/* Stream type assignments
*
/* Stream type assignments
*