From c4e7ebfe356a19362b261b285af171be525156c1 Mon Sep 17 00:00:00 2001 From: Josep Torra Valles Date: Mon, 16 Oct 2006 18:22:47 +0000 Subject: Fix a bunch of problems discovered by the Forte compiler, mostly type mixups and pointer arithmetics with void pointe... Original commit message from CVS: Patch by: Josep Torra Valles * ext/cairo/gsttimeoverlay.c: (gst_cairo_time_overlay_transform): * ext/esd/esdsink.c: (gst_esdsink_write): * ext/flac/gstflacdec.c: (gst_flac_dec_length), (gst_flac_dec_read_seekable), (gst_flac_dec_chain), (gst_flac_dec_send_newsegment): * ext/flac/gstflacenc.c: (gst_flac_enc_seek_callback), (gst_flac_enc_tell_callback): * ext/jpeg/smokecodec.c: (find_best_size), (smokecodec_encode), (smokecodec_parse_header), (smokecodec_decode): * gst/avi/gstavimux.c: (gst_avi_mux_write_avix_index): * gst/debug/efence.c: (gst_fenced_buffer_alloc): * gst/goom/Makefile.am: * gst/goom/gstgoom.c: * gst/icydemux/gsticydemux.c: (gst_icydemux_typefind_or_forward): * gst/rtsp/gstrtspsrc.c: * gst/rtsp/rtspconnection.c: (rtsp_connection_read): * gst/udp/gstudpsink.c: * gst/udp/gstudpsrc.c: * gst/wavparse/gstwavparse.c: (gst_wavparse_change_state): * sys/sunaudio/gstsunaudiomixertrack.h: Fix a bunch of problems discovered by the Forte compiler, mostly type mixups and pointer arithmetics with void pointers. Fixes #362603. --- ext/flac/gstflacdec.c | 10 +++++----- ext/flac/gstflacenc.c | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'ext/flac') diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c index 8a352910..1cf238ea 100644 --- a/ext/flac/gstflacdec.c +++ b/ext/flac/gstflacdec.c @@ -642,11 +642,11 @@ gst_flac_dec_length (const FLAC__SeekableStreamDecoder * decoder, flacdec = GST_FLAC_DEC (client_data); if (!(peer = gst_pad_get_peer (flacdec->sinkpad))) - return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR; + return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR; gst_pad_query_duration (peer, &fmt, &len); gst_object_unref (peer); if (fmt != GST_FORMAT_BYTES || len == -1) - return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR; + return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR; *length = len; @@ -696,7 +696,7 @@ gst_flac_dec_read_seekable (const FLAC__SeekableStreamDecoder * decoder, if (gst_pad_pull_range (flacdec->sinkpad, flacdec->offset, *bytes, &buf) != GST_FLOW_OK) - return FLAC__SEEKABLE_STREAM_DECODER_READ_ERROR; + return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR; GST_DEBUG ("Read %d bytes at %" G_GUINT64_FORMAT, GST_BUFFER_SIZE (buf), flacdec->offset); @@ -1101,7 +1101,7 @@ gst_flac_dec_sink_event (GstPad * pad, GstEvent * event) static GstFlowReturn gst_flac_dec_chain (GstPad * pad, GstBuffer * buf) { - FLAC__SeekableStreamDecoderState s; + FLAC__StreamDecoderState s; GstFlacDec *dec; gboolean got_audio_frame; @@ -1486,7 +1486,7 @@ gst_flac_dec_send_newsegment (GstFlacDec * flacdec, gboolean update) { GstSegment *s = &flacdec->segment; GstFormat target_format = GST_FORMAT_TIME; - gint64 stop_time = GST_CLOCK_TIME_NONE; + gint64 stop_time = -1; gint64 start_time = 0; /* segment is in DEFAULT format, but we want to send a TIME newsegment */ diff --git a/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c index b13d7719..90888fb4 100644 --- a/ext/flac/gstflacenc.c +++ b/ext/flac/gstflacenc.c @@ -501,7 +501,7 @@ gst_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder * encoder, flacenc = GST_FLAC_ENC (client_data); if (flacenc->stopped) - return FLAC__STREAM_ENCODER_OK; + return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_OK; event = gst_event_new_new_segment (TRUE, 1.0, GST_FORMAT_BYTES, absolute_byte_offset, GST_BUFFER_OFFSET_NONE, 0); @@ -525,7 +525,7 @@ gst_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder * encoder, flacenc->offset = absolute_byte_offset; - return FLAC__STREAM_ENCODER_OK; + return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_OK; } static FLAC__StreamEncoderWriteStatus @@ -585,7 +585,7 @@ gst_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder * encoder, *absolute_byte_offset = flacenc->offset; - return FLAC__STREAM_ENCODER_OK; + return FLAC__SEEKABLE_STREAM_ENCODER_TELL_STATUS_OK; } static gboolean -- cgit