mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-04-26 06:54:49 +00:00
Fix Forte compiler warnings.
Don't do void pointer arithmetic. Don't have an unreachable statement.
This commit is contained in:
parent
908c0da5f9
commit
367f9123de
2 changed files with 7 additions and 7 deletions
|
@ -156,10 +156,10 @@ gst_matroska_demux_change_state (GstElement * element,
|
||||||
/* caps functions */
|
/* caps functions */
|
||||||
static GstCaps *gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext
|
static GstCaps *gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext
|
||||||
* videocontext,
|
* videocontext,
|
||||||
const gchar * codec_id, gpointer data, guint size, gchar ** codec_name);
|
const gchar * codec_id, guint8 * data, guint size, gchar ** codec_name);
|
||||||
static GstCaps *gst_matroska_demux_audio_caps (GstMatroskaTrackAudioContext
|
static GstCaps *gst_matroska_demux_audio_caps (GstMatroskaTrackAudioContext
|
||||||
* audiocontext,
|
* audiocontext,
|
||||||
const gchar * codec_id, gpointer data, guint size, gchar ** codec_name);
|
const gchar * codec_id, guint8 * data, guint size, gchar ** codec_name);
|
||||||
static GstCaps
|
static GstCaps
|
||||||
* gst_matroska_demux_subtitle_caps (GstMatroskaTrackSubtitleContext *
|
* gst_matroska_demux_subtitle_caps (GstMatroskaTrackSubtitleContext *
|
||||||
subtitlecontext, const gchar * codec_id, gpointer data, guint size);
|
subtitlecontext, const gchar * codec_id, gpointer data, guint size);
|
||||||
|
@ -581,8 +581,8 @@ gst_matroska_demux_read_track_encoding (GstMatroskaDemux * demux,
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
|
||||||
DEBUG_ELEMENT_STOP (demux, ebml, "ContentCompression", ret);
|
DEBUG_ELEMENT_STOP (demux, ebml, "ContentCompression", ret);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
case GST_MATROSKA_ID_CONTENTENCRYPTION:
|
case GST_MATROSKA_ID_CONTENTENCRYPTION:
|
||||||
|
@ -1713,7 +1713,7 @@ gst_matroska_demux_add_stream (GstMatroskaDemux * demux)
|
||||||
templ = gst_element_class_get_pad_template (klass, "video_%02d");
|
templ = gst_element_class_get_pad_template (klass, "video_%02d");
|
||||||
caps = gst_matroska_demux_video_caps (videocontext,
|
caps = gst_matroska_demux_video_caps (videocontext,
|
||||||
context->codec_id,
|
context->codec_id,
|
||||||
context->codec_priv, context->codec_priv_size, &codec);
|
(guint8 *) context->codec_priv, context->codec_priv_size, &codec);
|
||||||
if (codec) {
|
if (codec) {
|
||||||
list = gst_tag_list_new ();
|
list = gst_tag_list_new ();
|
||||||
gst_tag_list_add (list, GST_TAG_MERGE_REPLACE,
|
gst_tag_list_add (list, GST_TAG_MERGE_REPLACE,
|
||||||
|
@ -4931,7 +4931,7 @@ gst_matroska_demux_sink_activate_pull (GstPad * sinkpad, gboolean active)
|
||||||
|
|
||||||
static GstCaps *
|
static GstCaps *
|
||||||
gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext *
|
gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext *
|
||||||
videocontext, const gchar * codec_id, gpointer data, guint size,
|
videocontext, const gchar * codec_id, guint8 * data, guint size,
|
||||||
gchar ** codec_name)
|
gchar ** codec_name)
|
||||||
{
|
{
|
||||||
GstMatroskaTrackContext *context = (GstMatroskaTrackContext *) videocontext;
|
GstMatroskaTrackContext *context = (GstMatroskaTrackContext *) videocontext;
|
||||||
|
@ -5282,7 +5282,7 @@ aac_profile_idx (const gchar * codec_id)
|
||||||
|
|
||||||
static GstCaps *
|
static GstCaps *
|
||||||
gst_matroska_demux_audio_caps (GstMatroskaTrackAudioContext *
|
gst_matroska_demux_audio_caps (GstMatroskaTrackAudioContext *
|
||||||
audiocontext, const gchar * codec_id, gpointer data, guint size,
|
audiocontext, const gchar * codec_id, guint8 * data, guint size,
|
||||||
gchar ** codec_name)
|
gchar ** codec_name)
|
||||||
{
|
{
|
||||||
GstMatroskaTrackContext *context = (GstMatroskaTrackContext *) audiocontext;
|
GstMatroskaTrackContext *context = (GstMatroskaTrackContext *) audiocontext;
|
||||||
|
|
|
@ -1130,7 +1130,7 @@ flac_streamheader_to_codecdata (const GValue * streamheader,
|
||||||
context->codec_priv =
|
context->codec_priv =
|
||||||
g_realloc (context->codec_priv,
|
g_realloc (context->codec_priv,
|
||||||
context->codec_priv_size + GST_BUFFER_SIZE (buffer));
|
context->codec_priv_size + GST_BUFFER_SIZE (buffer));
|
||||||
memcpy (context->codec_priv + context->codec_priv_size,
|
memcpy ((guint8 *) context->codec_priv + context->codec_priv_size,
|
||||||
GST_BUFFER_DATA (buffer), GST_BUFFER_SIZE (buffer));
|
GST_BUFFER_DATA (buffer), GST_BUFFER_SIZE (buffer));
|
||||||
context->codec_priv_size =
|
context->codec_priv_size =
|
||||||
context->codec_priv_size + GST_BUFFER_SIZE (buffer);
|
context->codec_priv_size + GST_BUFFER_SIZE (buffer);
|
||||||
|
|
Loading…
Reference in a new issue