summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
Diffstat (limited to 'gst')
-rw-r--r--gst/apetag/apedemux.c4
-rw-r--r--gst/colorspace/yuv2rgb.c9
-rw-r--r--gst/festival/gstfestival.c4
-rw-r--r--gst/flx/gstflxdec.c3
-rw-r--r--gst/games/gstvideoimage.c40
-rw-r--r--gst/games/gstvideoimage.h2
-rw-r--r--gst/librfb/rfbdecoder.c2
-rw-r--r--gst/mpeg1sys/gstmpeg1systemencode.c2
-rw-r--r--gst/mpeg2sub/gstmpeg2subt.c3
-rw-r--r--gst/mpegaudioparse/gstmpegaudioparse.c2
-rw-r--r--gst/rtjpeg/RTjpeg.c24
-rw-r--r--gst/vbidec/vbidata.c8
12 files changed, 51 insertions, 52 deletions
diff --git a/gst/apetag/apedemux.c b/gst/apetag/apedemux.c
index 8f4bca31..f6463afc 100644
--- a/gst/apetag/apedemux.c
+++ b/gst/apetag/apedemux.c
@@ -457,8 +457,8 @@ gst_ape_demux_parse_tags (GstApeDemux * ape, guint8 * data, gint size)
break;
/* read */
- tag = g_strndup (&data[8], n - 9);
- val = g_strndup (&data[n], len);
+ tag = g_strndup ((char *) &data[8], n - 9);
+ val = g_strndup ((char *) &data[n], len);
if (!strcasecmp (tag, "title")) {
type = GST_TAG_TITLE;
} else if (!strcasecmp (tag, "artist")) {
diff --git a/gst/colorspace/yuv2rgb.c b/gst/colorspace/yuv2rgb.c
index 290f07bc..4f9ba3ca 100644
--- a/gst/colorspace/yuv2rgb.c
+++ b/gst/colorspace/yuv2rgb.c
@@ -297,8 +297,7 @@ gst_colorspace_YV12_to_bgr16_mmx (GstColorspace * space, unsigned char *src,
*/
static int
-number_of_bits_set (a)
- unsigned long a;
+number_of_bits_set (unsigned long a)
{
if (!a)
return 0;
@@ -312,8 +311,7 @@ number_of_bits_set (a)
* Low performance, do not call often.
*/
static int
-free_bits_at_top (a)
- unsigned long a;
+free_bits_at_top (unsigned long a)
{
/* assume char is 8 bits */
if (!a)
@@ -329,8 +327,7 @@ free_bits_at_top (a)
* Low performance, do not call often.
*/
static int
-free_bits_at_bottom (a)
- unsigned long a;
+free_bits_at_bottom (unsigned long a)
{
/* assume char is 8 bits */
if (!a)
diff --git a/gst/festival/gstfestival.c b/gst/festival/gstfestival.c
index 0aefe233..4d0a3156 100644
--- a/gst/festival/gstfestival.c
+++ b/gst/festival/gstfestival.c
@@ -205,7 +205,7 @@ gst_festival_chain (GstPad * pad, GstData * _data)
gchar *wavefile;
int filesize;
FILE *fd;
- char *p;
+ guchar *p;
char ack[4];
int n;
GstFestival *festival;
@@ -255,7 +255,7 @@ gst_festival_chain (GstPad * pad, GstData * _data)
if (wavefile) {
outbuf = gst_buffer_new ();
- GST_BUFFER_DATA (outbuf) = wavefile;
+ GST_BUFFER_DATA (outbuf) = (guchar *) wavefile;
GST_BUFFER_SIZE (outbuf) = filesize;
gst_pad_push (festival->srcpad, GST_DATA (outbuf));
diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c
index 68f44559..07cce521 100644
--- a/gst/flx/gstflxdec.c
+++ b/gst/flx/gstflxdec.c
@@ -167,7 +167,8 @@ gst_flxdec_init (GstFlxDec * flxdec)
}
static void
-flx_decode_chunks (GstFlxDec * flxdec, gulong count, gchar * data, gchar * dest)
+flx_decode_chunks (GstFlxDec * flxdec, gulong count, guchar * data,
+ guchar * dest)
{
FlxFrameChunk *hdr;
diff --git a/gst/games/gstvideoimage.c b/gst/games/gstvideoimage.c
index c7905a14..ee8e150f 100644
--- a/gst/games/gstvideoimage.c
+++ b/gst/games/gstvideoimage.c
@@ -379,9 +379,9 @@ gst_video_image_copy_area (GstVideoImage * dest, gint xdest, gint ydest,
#define ROUND_UP_8(x) (((x)+7)&~7)
static void
-paint_setup_I420 (GstVideoImage * p, char *dest)
+paint_setup_I420 (GstVideoImage * p, guint8 * dest)
{
- p->yp = dest;
+ p->yp = (guint8 *) dest;
p->ystride = ROUND_UP_4 (p->width);
p->up = p->yp + p->ystride * ROUND_UP_2 (p->height);
p->ustride = ROUND_UP_8 (p->width) / 2;
@@ -421,7 +421,7 @@ copy_hline_I420 (GstVideoImage * dest, int xdest, int ydest,
}
static void
-paint_setup_YV12 (GstVideoImage * p, char *dest)
+paint_setup_YV12 (GstVideoImage * p, guint8 * dest)
{
p->yp = dest;
p->ystride = ROUND_UP_4 (p->width);
@@ -433,7 +433,7 @@ paint_setup_YV12 (GstVideoImage * p, char *dest)
}
static void
-paint_setup_YUY2 (GstVideoImage * p, char *dest)
+paint_setup_YUY2 (GstVideoImage * p, guint8 * dest)
{
p->yp = dest;
p->up = dest + 1;
@@ -443,7 +443,7 @@ paint_setup_YUY2 (GstVideoImage * p, char *dest)
}
static void
-paint_setup_UYVY (GstVideoImage * p, char *dest)
+paint_setup_UYVY (GstVideoImage * p, guint8 * dest)
{
p->yp = dest + 1;
p->up = dest;
@@ -453,7 +453,7 @@ paint_setup_UYVY (GstVideoImage * p, char *dest)
}
static void
-paint_setup_YVYU (GstVideoImage * p, char *dest)
+paint_setup_YVYU (GstVideoImage * p, guint8 * dest)
{
p->yp = dest;
p->up = dest + 3;
@@ -503,7 +503,7 @@ copy_hline_YUY2 (GstVideoImage * dest, int xdest, int ydest,
}
static void
-paint_setup_IYU2 (GstVideoImage * p, char *dest)
+paint_setup_IYU2 (GstVideoImage * p, guint8 * dest)
{
/* untested */
p->yp = dest + 1;
@@ -540,7 +540,7 @@ copy_hline_IYU2 (GstVideoImage * dest, int xdest, int ydest,
}
static void
-paint_setup_Y41B (GstVideoImage * p, char *dest)
+paint_setup_Y41B (GstVideoImage * p, guint8 * dest)
{
p->yp = dest;
p->ystride = ROUND_UP_4 (p->width);
@@ -582,7 +582,7 @@ copy_hline_Y41B (GstVideoImage * dest, int xdest, int ydest,
}
static void
-paint_setup_Y42B (GstVideoImage * p, char *dest)
+paint_setup_Y42B (GstVideoImage * p, guint8 * dest)
{
p->yp = dest;
p->ystride = ROUND_UP_4 (p->width);
@@ -624,7 +624,7 @@ copy_hline_Y42B (GstVideoImage * dest, int xdest, int ydest,
}
static void
-paint_setup_Y800 (GstVideoImage * p, char *dest)
+paint_setup_Y800 (GstVideoImage * p, guint8 * dest)
{
/* untested */
p->yp = dest;
@@ -652,7 +652,7 @@ copy_hline_Y800 (GstVideoImage * dest, int xdest, int ydest,
}
static void
-paint_setup_YVU9 (GstVideoImage * p, char *dest)
+paint_setup_YVU9 (GstVideoImage * p, guint8 * dest)
{
int h = ROUND_UP_4 (p->height);
@@ -666,7 +666,7 @@ paint_setup_YVU9 (GstVideoImage * p, char *dest)
}
static void
-paint_setup_YUV9 (GstVideoImage * p, char *dest)
+paint_setup_YUV9 (GstVideoImage * p, guint8 * dest)
{
/* untested */
int h = ROUND_UP_4 (p->height);
@@ -711,7 +711,7 @@ copy_hline_YUV9 (GstVideoImage * dest, int xdest, int ydest,
}
static void
-paint_setup_xRGB8888 (GstVideoImage * p, char *dest)
+paint_setup_xRGB8888 (GstVideoImage * p, guint8 * dest)
{
p->yp = dest + 1;
p->up = dest + 2;
@@ -721,7 +721,7 @@ paint_setup_xRGB8888 (GstVideoImage * p, char *dest)
}
static void
-paint_setup_xBGR8888 (GstVideoImage * p, char *dest)
+paint_setup_xBGR8888 (GstVideoImage * p, guint8 * dest)
{
p->yp = dest + 3;
p->up = dest + 2;
@@ -731,7 +731,7 @@ paint_setup_xBGR8888 (GstVideoImage * p, char *dest)
}
static void
-paint_setup_RGBx8888 (GstVideoImage * p, char *dest)
+paint_setup_RGBx8888 (GstVideoImage * p, guint8 * dest)
{
p->yp = dest + 0;
p->up = dest + 1;
@@ -741,7 +741,7 @@ paint_setup_RGBx8888 (GstVideoImage * p, char *dest)
}
static void
-paint_setup_BGRx8888 (GstVideoImage * p, char *dest)
+paint_setup_BGRx8888 (GstVideoImage * p, guint8 * dest)
{
p->yp = dest + 2;
p->up = dest + 1;
@@ -751,7 +751,7 @@ paint_setup_BGRx8888 (GstVideoImage * p, char *dest)
}
static void
-paint_setup_RGB888 (GstVideoImage * p, char *dest)
+paint_setup_RGB888 (GstVideoImage * p, guint8 * dest)
{
p->yp = dest + 0;
p->up = dest + 1;
@@ -761,7 +761,7 @@ paint_setup_RGB888 (GstVideoImage * p, char *dest)
}
static void
-paint_setup_BGR888 (GstVideoImage * p, char *dest)
+paint_setup_BGR888 (GstVideoImage * p, guint8 * dest)
{
p->yp = dest + 2;
p->up = dest + 1;
@@ -821,7 +821,7 @@ copy_hline_str3 (GstVideoImage * dest, int xdest, int ydest,
}
static void
-paint_setup_RGB565 (GstVideoImage * p, char *dest)
+paint_setup_RGB565 (GstVideoImage * p, guint8 * dest)
{
p->yp = dest;
p->ystride = ROUND_UP_4 (p->width * 2);
@@ -859,7 +859,7 @@ copy_hline_str2 (GstVideoImage * dest, int xdest, int ydest,
}
static void
-paint_setup_xRGB1555 (GstVideoImage * p, char *dest)
+paint_setup_xRGB1555 (GstVideoImage * p, guint8 * dest)
{
p->yp = dest;
p->ystride = ROUND_UP_4 (p->width * 2);
diff --git a/gst/games/gstvideoimage.h b/gst/games/gstvideoimage.h
index 7392d0d1..2fa91d85 100644
--- a/gst/games/gstvideoimage.h
+++ b/gst/games/gstvideoimage.h
@@ -67,7 +67,7 @@ struct _GstVideoFormat
char * fourcc;
char * name;
int bitspp;
- void (* paint_setup) (GstVideoImage * p, char *dest);
+ void (* paint_setup) (GstVideoImage * p, guint8 *dest);
void (* paint_hline) (GstVideoImage * p, int x, int y, int w, const GstVideoColor *c);
void (* copy_hline) (GstVideoImage * dest, int destx, int desty,
GstVideoImage * src, int srcx, int srcy, int w);
diff --git a/gst/librfb/rfbdecoder.c b/gst/librfb/rfbdecoder.c
index b30dc34d..45d93782 100644
--- a/gst/librfb/rfbdecoder.c
+++ b/gst/librfb/rfbdecoder.c
@@ -157,7 +157,7 @@ rfb_decoder_state_wait_for_protocol_version (RfbDecoder * decoder)
GST_DEBUG ("\"%.11s\"", buffer->data);
rfb_buffer_free (buffer);
- rfb_decoder_send (decoder, "RFB 003.003\n", 12);
+ rfb_decoder_send (decoder, (guchar *) "RFB 003.003\n", 12);
decoder->state = rfb_decoder_state_wait_for_security;
diff --git a/gst/mpeg1sys/gstmpeg1systemencode.c b/gst/mpeg1sys/gstmpeg1systemencode.c
index 35c3e0b6..d2839db1 100644
--- a/gst/mpeg1sys/gstmpeg1systemencode.c
+++ b/gst/mpeg1sys/gstmpeg1systemencode.c
@@ -385,7 +385,7 @@ static void
gst_system_encode_multiplex (GstMPEG1SystemEncode * system_encode)
{
GList *streams;
- Mpeg1MuxBuffer *mb = (Mpeg1MuxBuffer *) streams->data;
+ Mpeg1MuxBuffer *mb;
guchar timestamps;
guchar buffer_scale;
GstBuffer *outbuf;
diff --git a/gst/mpeg2sub/gstmpeg2subt.c b/gst/mpeg2sub/gstmpeg2subt.c
index 23a2456e..4f6347e5 100644
--- a/gst/mpeg2sub/gstmpeg2subt.c
+++ b/gst/mpeg2sub/gstmpeg2subt.c
@@ -704,6 +704,7 @@ gst_mpeg2subt_merge_title (GstMpeg2Subt * mpeg2subt, GstBuffer * buf)
" using %s colour table", GST_BUFFER_TIMESTAMP (buf),
mpeg2subt->forced_display ? "menu" : "subtitle");
+ state.next = 0;
state.id = 0;
state.aligned = 1;
state.offset[0] = mpeg2subt->offset[0];
@@ -908,7 +909,7 @@ gst_mpeg2subt_handle_dvd_event (GstMpeg2Subt * mpeg2subt, GstEvent * event,
gst_update_still_frame (mpeg2subt);
} else if (from_sub_pad && !strcmp (event_type, "dvd-spu-clut-change")) {
/* Take a copy of the colour table */
- guchar name[16];
+ gchar name[16];
int i;
gint value;
diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c
index 8e77acac..eba2044b 100644
--- a/gst/mpegaudioparse/gstmpegaudioparse.c
+++ b/gst/mpegaudioparse/gstmpegaudioparse.c
@@ -387,7 +387,7 @@ gst_mp3parse_chain (GstPad * pad, GstData * _data)
bpf);
break;
} else {
- guint bitrate, layer, rate, channels;
+ guint bitrate = 0, layer = 0, rate = 0, channels = 0;
if (!mp3_type_frame_length_from_header (header, &layer,
&channels, &bitrate, &rate)) {
diff --git a/gst/rtjpeg/RTjpeg.c b/gst/rtjpeg/RTjpeg.c
index eaf8a5ab..632a9240 100644
--- a/gst/rtjpeg/RTjpeg.c
+++ b/gst/rtjpeg/RTjpeg.c
@@ -2544,9 +2544,9 @@ int
RTjpeg_compressYUV420 (__s8 * sp, unsigned char *bp)
{
__s8 *sb;
- register __s8 *bp1 = bp + (RTjpeg_width << 3);
- register __s8 *bp2 = bp + RTjpeg_Ysize;
- register __s8 *bp3 = bp2 + (RTjpeg_Csize >> 1);
+ register __u8 *bp1 = bp + (RTjpeg_width << 3);
+ register __u8 *bp2 = bp + RTjpeg_Ysize;
+ register __u8 *bp3 = bp2 + (RTjpeg_Csize >> 1);
register int i, j, k;
#ifdef HAVE_LIBMMX
@@ -2597,8 +2597,8 @@ int
RTjpeg_compressYUV422 (__s8 * sp, unsigned char *bp)
{
__s8 *sb;
- register __s8 *bp2 = bp + RTjpeg_Ysize;
- register __s8 *bp3 = bp2 + RTjpeg_Csize;
+ register __u8 *bp2 = bp + RTjpeg_Ysize;
+ register __u8 *bp3 = bp2 + RTjpeg_Csize;
register int i, j, k;
#ifdef HAVE_LIBMMX
@@ -2666,8 +2666,8 @@ RTjpeg_compress8 (__s8 * sp, unsigned char *bp)
void
RTjpeg_decompressYUV422 (__s8 * sp, __u8 * bp)
{
- register __s8 *bp2 = bp + RTjpeg_Ysize;
- register __s8 *bp3 = bp2 + (RTjpeg_Csize);
+ register __u8 *bp2 = bp + RTjpeg_Ysize;
+ register __u8 *bp3 = bp2 + (RTjpeg_Csize);
int i, j, k;
#ifdef HAVE_LIBMMX
@@ -2714,9 +2714,9 @@ RTjpeg_decompressYUV422 (__s8 * sp, __u8 * bp)
void
RTjpeg_decompressYUV420 (__s8 * sp, __u8 * bp)
{
- register __s8 *bp1 = bp + (RTjpeg_width << 3);
- register __s8 *bp2 = bp + RTjpeg_Ysize;
- register __s8 *bp3 = bp2 + (RTjpeg_Csize >> 1);
+ register __u8 *bp1 = bp + (RTjpeg_width << 3);
+ register __u8 *bp2 = bp + RTjpeg_Ysize;
+ register __u8 *bp3 = bp2 + (RTjpeg_Csize >> 1);
int i, j, k;
#ifdef HAVE_LIBMMX
@@ -2896,8 +2896,8 @@ RTjpeg_mcompress (__s8 * sp, unsigned char *bp, __u16 lmask, __u16 cmask)
{
__s8 *sb;
__s16 *block;
- register __s8 *bp2;
- register __s8 *bp3;
+ register __u8 *bp2;
+ register __u8 *bp3;
register int i, j, k;
#ifdef HAVE_LIBMMX
diff --git a/gst/vbidec/vbidata.c b/gst/vbidec/vbidata.c
index 76f43110..87b90ea4 100644
--- a/gst/vbidec/vbidata.c
+++ b/gst/vbidec/vbidata.c
@@ -203,7 +203,7 @@ const char *canf_tv[] = { "Exempt", "G", "8 ans +", "13 ans +",
"Reserved"
};
-const char *months[] = { 0, "Jan", "Feb", "Mar", "Apr", "May",
+const char *months[] = { NULL, "Jan", "Feb", "Mar", "Apr", "May",
"Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
};
@@ -1000,7 +1000,7 @@ vbidata_new_file (const char *filename, vbiscreen_t * vs,
vbidata_t *vbi = (vbidata_t *) malloc (sizeof (vbidata_t));
if (!vbi) {
- return 0;
+ return NULL;
}
vbi->fd = open (filename, O_RDONLY);
@@ -1008,7 +1008,7 @@ vbidata_new_file (const char *filename, vbiscreen_t * vs,
fprintf (stderr, "vbidata: Can't open %s: %s\n",
filename, strerror (errno));
free (vbi);
- return 0;
+ return NULL;
}
vbi->vs = vs;
@@ -1026,7 +1026,7 @@ vbidata_new_line (vbiscreen_t * vs, int verbose)
vbidata_t *vbi = (vbidata_t *) malloc (sizeof (vbidata_t));
if (!vbi) {
- return 0;
+ return NULL;
}
vbi->vs = vs;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-07 01:40:38 +0000