Author: ods15 Date: Fri Nov 10 13:35:55 2006 New Revision: 198 Modified: trunk/libnut/muxer.c trunk/nututils/demux_avi.c trunk/nututils/demux_ogg.c trunk/nututils/framer_vorbis.c Log: shut up some gcc 4.0 pointer-sign warnings Modified: trunk/libnut/muxer.c ============================================================================== --- trunk/libnut/muxer.c (original) +++ trunk/libnut/muxer.c Fri Nov 10 13:35:55 2006 @@ -95,7 +95,7 @@ else put_v(bc, 2*val-1); } -static void put_data(output_buffer_t * bc, int len, const uint8_t * data) { +static void put_data(output_buffer_t * bc, int len, const void * data) { if (!len) return; assert(data); if (bc->write_len - (bc->buf_ptr - bc->buf) > len || bc->is_mem) { @@ -108,7 +108,7 @@ } } -static void put_vb(output_buffer_t * bc, int len, uint8_t * data) { +static void put_vb(output_buffer_t * bc, int len, const void * data) { put_v(bc, len); put_data(bc, len, data); } Modified: trunk/nututils/demux_avi.c ============================================================================== --- trunk/nututils/demux_avi.c (original) +++ trunk/nututils/demux_avi.c Fri Nov 10 13:35:55 2006 @@ -342,7 +342,7 @@ }; int j; for (j = sizeof(fourccs)/sizeof(fourccs[0]); j--; ) { - if (!strncmp(avi->stream[i].video->biCompression, fourccs[j], 4)) break; + if (!strncmp((char*)avi->stream[i].video->biCompression, fourccs[j], 4)) break; } if (j == -1) return err_avi_no_video_codec; } else { @@ -379,7 +379,7 @@ avi->s[i].sh.colorspace_type = 0; } else { // audio avi->s[i].sh.fourcc_len = 4; - avi->s[i].sh.fourcc = "mp3 "; + avi->s[i].sh.fourcc = (uint8_t*)"mp3 "; avi->s[i].codec_id = e_mp3; avi->s[i].sh.decode_delay = 0; Modified: trunk/nututils/demux_ogg.c ============================================================================== --- trunk/nututils/demux_ogg.c (original) +++ trunk/nututils/demux_ogg.c Fri Nov 10 13:35:55 2006 @@ -25,7 +25,7 @@ }; static struct { enum nutmerge_codecs id; uint8_t * magic; int magic_len; } codecs[] = { - { e_vorbis, "\001vorbis", 7 }, + { e_vorbis, (uint8_t*)"\001vorbis", 7 }, { 0, NULL, 0 } }; Modified: trunk/nututils/framer_vorbis.c ============================================================================== --- trunk/nututils/framer_vorbis.c (original) +++ trunk/nututils/framer_vorbis.c Fri Nov 10 13:35:55 2006 @@ -101,7 +101,7 @@ s->type = NUT_AUDIO_CLASS; s->fourcc_len = 4; - s->fourcc = "vrbs"; + s->fourcc = (uint8_t*)"vrbs"; s->time_base.den = sample_rate / gcd(sample_rate, i); s->time_base.nom = i / gcd(sample_rate, i); s->fixed_fps = 0;