From b68f9fef32971095836ea6bbeb2f12af417120d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Wed, 4 May 2011 22:12:55 +0200 Subject: cleanup: shut up more warnings --- libmpdemux/aac_hdr.c | 3 ++- libmpdemux/asfheader.c | 2 +- libmpdemux/demux_asf.c | 6 +++--- libmpdemux/demux_avi.c | 2 +- libmpdemux/demux_film.c | 2 +- libmpdemux/demux_gif.c | 2 +- libmpdemux/demux_mov.c | 2 +- libmpdemux/demux_mpg.c | 7 ++++--- libmpdemux/demux_ogg.c | 2 +- libmpdemux/demux_pva.c | 3 +-- libmpdemux/demux_real.c | 12 +++++++----- libmpdemux/demux_roq.c | 3 ++- libmpdemux/demux_smjpeg.c | 4 ++-- libmpdemux/demux_ts.c | 4 ++-- libmpdemux/demuxer.h | 2 +- libmpdemux/mpeg_hdr.c | 6 +++--- libmpdemux/yuv4mpeg.c | 3 ++- 17 files changed, 35 insertions(+), 30 deletions(-) (limited to 'libmpdemux') diff --git a/libmpdemux/aac_hdr.c b/libmpdemux/aac_hdr.c index aed06f0e28..36991e27a2 100644 --- a/libmpdemux/aac_hdr.c +++ b/libmpdemux/aac_hdr.c @@ -20,6 +20,7 @@ #include #include "aac_hdr.h" +#include "libavutil/attributes.h" /// \param srate (out) sample rate /// \param num (out) number of audio frames in this ADTS frame @@ -27,7 +28,7 @@ /// aac_parse_frames needs a buffer at least 8 bytes long int aac_parse_frame(uint8_t *buf, int *srate, int *num) { - int i = 0, sr, fl = 0, id; + int i = 0, sr, fl = 0, id av_unused; static int srates[] = {96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, 0, 0, 0}; if((buf[i] != 0xFF) || ((buf[i+1] & 0xF6) != 0xF0)) diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c index 7a2285e2a1..994c3e890d 100644 --- a/libmpdemux/asfheader.c +++ b/libmpdemux/asfheader.c @@ -139,7 +139,7 @@ static int get_ext_stream_properties(char *buf, int buf_len, int stream_num, str { int pos=0; uint8_t *buffer = &buf[0]; - uint64_t avg_ft; + uint64_t avg_ft av_unused; unsigned bitrate; while ((pos = find_asf_guid(buf, asf_ext_stream_header, pos, buf_len)) >= 0) { diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c index aef2f5ece0..5c79774da7 100644 --- a/libmpdemux/demux_asf.c +++ b/libmpdemux/demux_asf.c @@ -200,7 +200,7 @@ static int demux_asf_read_packet(demuxer_t *demux,unsigned char *data,int len,in */ static void get_payload_extension_data(demuxer_t *demux, unsigned char** pp, unsigned char id, unsigned int seq, int *keyframe, uint64_t *seg_time){ struct asf_priv* asf = demux->priv; - uint64_t payload_time; //100ns units + uint64_t payload_time = -1; //100ns units int i, ext_max, ext_timing_index; uint8_t *pi = *pp+4; @@ -362,8 +362,8 @@ static int demux_asf_fill_buffer(demuxer_t *demux, demux_stream_t *ds){ unsigned char segtype=p[1]; unsigned padding; unsigned plen; - unsigned sequence; - unsigned long time=0; + unsigned sequence av_unused; + unsigned long time av_unused = 0; unsigned short duration=0; int segs=1; diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index 904f6b8675..f73648166c 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -808,7 +808,7 @@ static int demux_avi_control(demuxer_t *demuxer,int cmd, void *arg){ case DEMUXER_CTRL_SWITCH_VIDEO: { int audio = (cmd == DEMUXER_CTRL_SWITCH_AUDIO); demux_stream_t *ds = audio ? demuxer->audio : demuxer->video; - void **streams = audio ? demuxer->a_streams : demuxer->v_streams; + void **streams = audio ? (void **)demuxer->a_streams : (void **)demuxer->v_streams; int maxid = FFMIN(100, audio ? MAX_A_STREAMS : MAX_V_STREAMS); int chunkid; if (ds->id < -1) diff --git a/libmpdemux/demux_film.c b/libmpdemux/demux_film.c index c720e85887..8575d5f1e8 100644 --- a/libmpdemux/demux_film.c +++ b/libmpdemux/demux_film.c @@ -158,7 +158,7 @@ static int demux_film_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) memcpy( tmp, buf, film_chunk.chunk_size ); } else {/* for 16bit */ - unsigned short* tmp = dp->buffer; + unsigned short *tmp = (unsigned short *)dp->buffer; unsigned short buf[film_chunk.chunk_size/2]; for(i = 0; i < film_chunk.chunk_size/4; i++) { buf[i*2] = tmp[i]; diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c index ce7a3d1252..eee7a856dc 100644 --- a/libmpdemux/demux_gif.c +++ b/libmpdemux/demux_gif.c @@ -89,7 +89,7 @@ static int demux_gif_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) uint8_t *buf = NULL; int refmode = 0; int transparency = 0; - uint8_t transparent_col; + uint8_t transparent_col = 0; while (type != IMAGE_DESC_RECORD_TYPE) { if (DGifGetRecordType(gif, &type) == GIF_ERROR) { diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index 5ecb076698..521b499ff6 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -622,7 +622,7 @@ static int gen_sh_audio(sh_audio_t* sh, mov_track_t* trak, int timescale) { // ([int32_t size,int32_t type,some data ],repeat) } my_stdata; #endif - int version, adjust; + int version = -1, adjust; int is_vorbis = 0; sh->format=trak->fourcc; diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c index cc798a0430..93ee4106aa 100644 --- a/libmpdemux/demux_mpg.c +++ b/libmpdemux/demux_mpg.c @@ -28,6 +28,7 @@ #include "mp_msg.h" #include "options.h" +#include "libavutil/attributes.h" #include "libmpcodecs/dec_audio.h" #include "stream/stream.h" #include "demuxer.h" @@ -286,12 +287,12 @@ static void new_audio_stream(demuxer_t *demux, int aid){ } static int demux_mpg_read_packet(demuxer_t *demux,int id){ - int d; + int d av_unused; int len; int set_pts=0; // !=0 iff pts has been set to a proper value unsigned char c=0; unsigned long long pts=0; - unsigned long long dts=0; + unsigned long long dts av_unused = 0; int l; int pes_ext2_subid=-1; double stream_pts = MP_NOPTS_VALUE; @@ -671,7 +672,7 @@ static inline void update_stats(int head) } static int demux_mpg_probe(demuxer_t *demuxer) { - int pes=1; + int pes av_unused = 1; int tmp; off_t tmppos; int file_format = DEMUXER_TYPE_UNKNOWN; diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index 08ed883d7b..18da80f72a 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -411,7 +411,7 @@ static void demux_ogg_check_comments(demuxer_t *d, ogg_stream_t *os, }; while (*cmt) { - hdr = NULL; + hdr = val = NULL; if (!strncasecmp(*cmt, "LANGUAGE=", 9)) { val = *cmt + 9; if (ogg_d->subs[id].text) diff --git a/libmpdemux/demux_pva.c b/libmpdemux/demux_pva.c index dc25d29662..883641fbc8 100644 --- a/libmpdemux/demux_pva.c +++ b/libmpdemux/demux_pva.c @@ -198,7 +198,7 @@ static int pva_get_payload(demuxer_t *d, pva_payload_t *payload) { uint8_t flags,pes_head_len; uint16_t pack_size; - off_t next_offset,pva_payload_start; + off_t pva_payload_start; unsigned char buffer[256]; #ifndef PVA_NEW_PREBYTES_CODE demux_packet_t * dp; //hack to deliver the preBytes (see PVA doc) @@ -273,7 +273,6 @@ static int pva_get_payload(demuxer_t *d, pva_payload_t *payload) pack_size=stream_read_word(d->stream); mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_pva::pva_get_payload(): pack_size=%u field read at offset %"PRIu64"\n",pack_size,(int64_t)stream_tell(d->stream)-2); pva_payload_start=stream_tell(d->stream); - next_offset=pva_payload_start+pack_size; /* diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c index 1bdf8ec19b..b392df817c 100644 --- a/libmpdemux/demux_real.c +++ b/libmpdemux/demux_real.c @@ -577,7 +577,7 @@ static int demux_real_fill_buffer(demuxer_t *demuxer, demux_stream_t *dsds) #endif int flags; int version; - int reserved; + int reserved av_unused; demux_packet_t *dp; int x, sps, cfs, sph, spc, w; int audioreorder_getnextpk = 0; @@ -892,7 +892,7 @@ got_video: if (0x40==(vpkg_header&0xc0)) { // seems to be a very short header // 2 bytes, purpose of the second byte yet unknown - int bummer; + int bummer av_unused; bummer=stream_read_char(demuxer->stream); --len; mp_dbg(MSGT_DEMUX,MSGL_DBG2, "%02X",bummer); vpkg_offset=0; @@ -1267,7 +1267,7 @@ static demuxer_t* demux_open_real(demuxer_t* demuxer) int sub_packet_size; int sub_packet_h; int version; - int flavor; + int flavor av_unused; int coded_frame_size; int codecdata_length; int i; @@ -1321,6 +1321,8 @@ static demuxer_t* demux_open_real(demuxer_t* demuxer) sh->samplesize = 16; sh->samplerate = 8000; frame_size = 240; + sub_packet_h = 0; + sub_packet_size = coded_frame_size = 0x14; strcpy(buf, "14_4"); } else { stream_skip(demuxer->stream, 2); // 00 00 @@ -1387,7 +1389,7 @@ static demuxer_t* demux_open_real(demuxer_t* demuxer) // sh->format = 0x2000; break; case MKTAG('1', '4', '_', '4'): - sh->wf->nBlockAlign = 0x14; + sh->wf->nBlockAlign = coded_frame_size; break; case MKTAG('2', '8', '_', '8'): @@ -1686,7 +1688,7 @@ header_end: } else { priv->audio_curpos = priv->str_data_offset[demuxer->audio->id] + 18; stream_seek(demuxer->stream, priv->str_data_offset[demuxer->audio->id]+10); - priv->a_num_of_packets=priv->a_num_of_packets = stream_read_dword(demuxer->stream); + priv->a_num_of_packets = stream_read_dword(demuxer->stream); priv->video_curpos = priv->str_data_offset[demuxer->video->id] + 18; stream_seek(demuxer->stream, priv->str_data_offset[demuxer->video->id]+10); priv->v_num_of_packets = stream_read_dword(demuxer->stream); diff --git a/libmpdemux/demux_roq.c b/libmpdemux/demux_roq.c index aafcd29468..af9e4c5a8e 100644 --- a/libmpdemux/demux_roq.c +++ b/libmpdemux/demux_roq.c @@ -31,6 +31,7 @@ #include "stream/stream.h" #include "demuxer.h" #include "stheader.h" +#include "libavutil/attributes.h" #define RoQ_INFO 0x1001 #define RoQ_QUAD_CODEBOOK 0x1002 @@ -110,7 +111,7 @@ static demuxer_t* demux_open_roq(demuxer_t* demuxer) roq_data_t *roq_data = malloc(sizeof(roq_data_t)); int chunk_id; int chunk_size; - int chunk_arg; + int chunk_arg av_unused; int last_chunk_id = 0; int largest_audio_chunk = 0; int fps; diff --git a/libmpdemux/demux_smjpeg.c b/libmpdemux/demux_smjpeg.c index 8933e8c8f5..8dabc8a0e2 100644 --- a/libmpdemux/demux_smjpeg.c +++ b/libmpdemux/demux_smjpeg.c @@ -28,7 +28,7 @@ #include "config.h" #include "mp_msg.h" - +#include "libavutil/attributes.h" #include "stream/stream.h" #include "demuxer.h" #include "stheader.h" @@ -103,7 +103,7 @@ static int demux_smjpeg_fill_buffer(demuxer_t *demux, demux_stream_t *ds) static demuxer_t* demux_open_smjpeg(demuxer_t* demuxer){ sh_video_t* sh_video; sh_audio_t* sh_audio; - unsigned int htype = 0, hleng; + unsigned int htype = 0, hleng av_unused; int i = 0; /* file header */ diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index dbb9f3ef55..ebb1709f5a 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -661,7 +661,7 @@ static int a52_check(char *buf, int len) static off_t ts_detect_streams(demuxer_t *demuxer, tsdemux_init_t *param) { - int video_found = 0, audio_found = 0, sub_found = 0, i, num_packets = 0, req_apid, req_vpid, req_spid; + int video_found = 0, audio_found = 0, sub_found av_unused = 0, i, num_packets = 0, req_apid, req_vpid, req_spid; int is_audio, is_video, is_sub, has_tables; int32_t p, chosen_pid = 0; off_t pos=0, ret = 0, init_pos, end_pos; @@ -2764,7 +2764,7 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet, { ES_stream_t *tss; int buf_size, is_start, pid, base; - int len, cc, cc_ok, afc, retv = 0, is_video, is_audio, is_sub; + int len, cc, cc_ok av_unused, afc, retv = 0, is_video, is_audio, is_sub; ts_priv_t * priv = (ts_priv_t*) demuxer->priv; stream_t *stream = demuxer->stream; char *p; diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index ed2d651a8c..abb3dd62b1 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -241,7 +241,7 @@ typedef struct demux_attachment typedef struct demuxer { const demuxer_desc_t *desc; ///< Demuxer description structure - char *filetype; // format name when not identified by demuxer (libavformat) + const char *filetype; // format name when not identified by demuxer (libavformat) off_t filepos; // input stream current pos. off_t movi_start; off_t movi_end; diff --git a/libmpdemux/mpeg_hdr.c b/libmpdemux/mpeg_hdr.c index b42f7e86c2..2a00727e3a 100644 --- a/libmpdemux/mpeg_hdr.c +++ b/libmpdemux/mpeg_hdr.c @@ -25,7 +25,7 @@ #include "config.h" #include "mpeg_hdr.h" - +#include "libavutil/attributes.h" #include "mp_msg.h" static float frameratecode2framerate[16] = { @@ -45,7 +45,7 @@ static float frameratecode2framerate[16] = { int mp_header_process_sequence_header (mp_mpeg_header_t * picture, const unsigned char * buffer) { - int width, height; + int width av_unused, height; if ((buffer[6] & 0x20) != 0x20){ fprintf(stderr, "missing marker bit!\n"); @@ -209,7 +209,7 @@ static int read_timeinc(mp_mpeg_header_t * picture, unsigned char * buffer, int int mp4_header_process_vol(mp_mpeg_header_t * picture, unsigned char * buffer) { - unsigned int n, aspect=0, aspectw=0, aspecth=0, x=1, v; + unsigned int n, aspect=0, aspectw av_unused=0, aspecth av_unused=0, x=1, v; //begins with 0x0000012x picture->fps = 0; diff --git a/libmpdemux/yuv4mpeg.c b/libmpdemux/yuv4mpeg.c index efee4e18bf..1606faa41b 100644 --- a/libmpdemux/yuv4mpeg.c +++ b/libmpdemux/yuv4mpeg.c @@ -31,6 +31,7 @@ #include "yuv4mpeg.h" #include "yuv4mpeg_intern.h" #include "mp_msg.h" +#include "libavutil/attributes.h" static int _y4mparam_allow_unknown_tags = 1; /* default is forgiveness */ @@ -412,7 +413,7 @@ int y4m_parse_stream_tags(char *s, y4m_stream_info_t *i) static int y4m_parse_frame_tags(char *s, y4m_frame_info_t *i) { - char *token, *value; + char *token, *value av_unused; char tag; int err; -- cgit v1.2.3