# HG changeset patch # User diego # Date 1176063856 0 # Node ID 2f0154760e5f8a8abc4a1ec81d23d858441f357e # Parent fb04036147f83472b6d8f5180d3e4e0645ba3e2a Get rid of unnecessary pointer casts. patch by Nicholas Tung, ntung ntung com diff -r fb04036147f8 -r 2f0154760e5f 4xm.c --- a/4xm.c Sun Apr 08 20:21:11 2007 +0000 +++ b/4xm.c Sun Apr 08 20:24:16 2007 +0000 @@ -93,7 +93,7 @@ unsigned int fourcc_tag; unsigned int size; int header_size; - FourxmDemuxContext *fourxm = (FourxmDemuxContext *)s->priv_data; + FourxmDemuxContext *fourxm = s->priv_data; unsigned char *header; int i; int current_track = -1; @@ -310,7 +310,7 @@ static int fourxm_read_close(AVFormatContext *s) { - FourxmDemuxContext *fourxm = (FourxmDemuxContext *)s->priv_data; + FourxmDemuxContext *fourxm = s->priv_data; av_free(fourxm->tracks); diff -r fb04036147f8 -r 2f0154760e5f dsicin.c --- a/dsicin.c Sun Apr 08 20:21:11 2007 +0000 +++ b/dsicin.c Sun Apr 08 20:24:16 2007 +0000 @@ -92,7 +92,7 @@ static int cin_read_header(AVFormatContext *s, AVFormatParameters *ap) { int rc; - CinDemuxContext *cin = (CinDemuxContext *)s->priv_data; + CinDemuxContext *cin = s->priv_data; CinFileHeader *hdr = &cin->file_header; ByteIOContext *pb = &s->pb; AVStream *st; @@ -157,7 +157,7 @@ static int cin_read_packet(AVFormatContext *s, AVPacket *pkt) { - CinDemuxContext *cin = (CinDemuxContext *)s->priv_data; + CinDemuxContext *cin = s->priv_data; ByteIOContext *pb = &s->pb; CinFrameHeader *hdr = &cin->frame_header; int rc, palette_type, pkt_size; diff -r fb04036147f8 -r 2f0154760e5f dvenc.c --- a/dvenc.c Sun Apr 08 20:21:11 2007 +0000 +++ b/dvenc.c Sun Apr 08 20:24:16 2007 +0000 @@ -283,7 +283,7 @@ DVMuxContext* dv_init_mux(AVFormatContext* s) { - DVMuxContext *c = (DVMuxContext *)s->priv_data; + DVMuxContext *c = s->priv_data; AVStream *vst = NULL; int i; @@ -373,7 +373,7 @@ uint8_t* frame; int fsize; - fsize = dv_assemble_frame((DVMuxContext *)s->priv_data, s->streams[pkt->stream_index], + fsize = dv_assemble_frame(s->priv_data, s->streams[pkt->stream_index], pkt->data, pkt->size, &frame); if (fsize > 0) { put_buffer(&s->pb, frame, fsize); @@ -390,7 +390,7 @@ */ static int dv_write_trailer(struct AVFormatContext *s) { - dv_delete_mux((DVMuxContext *)s->priv_data); + dv_delete_mux(s->priv_data); return 0; } #endif /* CONFIG_MUXERS */ diff -r fb04036147f8 -r 2f0154760e5f electronicarts.c --- a/electronicarts.c Sun Apr 08 20:21:11 2007 +0000 +++ b/electronicarts.c Sun Apr 08 20:24:16 2007 +0000 @@ -80,7 +80,7 @@ static int process_ea_header(AVFormatContext *s) { int inHeader; uint32_t blockid, size; - EaDemuxContext *ea = (EaDemuxContext *)s->priv_data; + EaDemuxContext *ea = s->priv_data; ByteIOContext *pb = &s->pb; if (get_buffer(pb, (void*)&blockid, 4) != 4) { @@ -174,7 +174,7 @@ static int ea_read_header(AVFormatContext *s, AVFormatParameters *ap) { - EaDemuxContext *ea = (EaDemuxContext *)s->priv_data; + EaDemuxContext *ea = s->priv_data; AVStream *st; if (!process_ea_header(s)) @@ -272,7 +272,7 @@ static int ea_read_close(AVFormatContext *s) { -// EaDemuxContext *ea = (EaDemuxContext *)s->priv_data; +// EaDemuxContext *ea = s->priv_data; return 0; } diff -r fb04036147f8 -r 2f0154760e5f flic.c --- a/flic.c Sun Apr 08 20:21:11 2007 +0000 +++ b/flic.c Sun Apr 08 20:24:16 2007 +0000 @@ -67,7 +67,7 @@ static int flic_read_header(AVFormatContext *s, AVFormatParameters *ap) { - FlicDemuxContext *flic = (FlicDemuxContext *)s->priv_data; + FlicDemuxContext *flic = s->priv_data; ByteIOContext *pb = &s->pb; unsigned char header[FLIC_HEADER_SIZE]; AVStream *st; @@ -157,7 +157,7 @@ static int flic_read_packet(AVFormatContext *s, AVPacket *pkt) { - FlicDemuxContext *flic = (FlicDemuxContext *)s->priv_data; + FlicDemuxContext *flic = s->priv_data; ByteIOContext *pb = &s->pb; int packet_read = 0; unsigned int size; @@ -204,7 +204,7 @@ static int flic_read_close(AVFormatContext *s) { -// FlicDemuxContext *flic = (FlicDemuxContext *)s->priv_data; +// FlicDemuxContext *flic = s->priv_data; return 0; } diff -r fb04036147f8 -r 2f0154760e5f idcin.c --- a/idcin.c Sun Apr 08 20:21:11 2007 +0000 +++ b/idcin.c Sun Apr 08 20:24:16 2007 +0000 @@ -137,7 +137,7 @@ AVFormatParameters *ap) { ByteIOContext *pb = &s->pb; - IdcinDemuxContext *idcin = (IdcinDemuxContext *)s->priv_data; + IdcinDemuxContext *idcin = s->priv_data; AVStream *st; unsigned int width, height; unsigned int sample_rate, bytes_per_sample, channels; @@ -214,7 +214,7 @@ int ret; unsigned int command; unsigned int chunk_size; - IdcinDemuxContext *idcin = (IdcinDemuxContext *)s->priv_data; + IdcinDemuxContext *idcin = s->priv_data; ByteIOContext *pb = &s->pb; int i; int palette_scale; diff -r fb04036147f8 -r 2f0154760e5f idroq.c --- a/idroq.c Sun Apr 08 20:21:11 2007 +0000 +++ b/idroq.c Sun Apr 08 20:24:16 2007 +0000 @@ -272,7 +272,7 @@ static int roq_read_close(AVFormatContext *s) { -// RoqDemuxContext *roq = (RoqDemuxContext *)s->priv_data; +// RoqDemuxContext *roq = s->priv_data; return 0; } diff -r fb04036147f8 -r 2f0154760e5f ipmovie.c --- a/ipmovie.c Sun Apr 08 20:21:11 2007 +0000 +++ b/ipmovie.c Sun Apr 08 20:24:16 2007 +0000 @@ -516,7 +516,7 @@ static int ipmovie_read_header(AVFormatContext *s, AVFormatParameters *ap) { - IPMVEContext *ipmovie = (IPMVEContext *)s->priv_data; + IPMVEContext *ipmovie = s->priv_data; ByteIOContext *pb = &s->pb; AVPacket pkt; AVStream *st; @@ -588,7 +588,7 @@ static int ipmovie_read_packet(AVFormatContext *s, AVPacket *pkt) { - IPMVEContext *ipmovie = (IPMVEContext *)s->priv_data; + IPMVEContext *ipmovie = s->priv_data; ByteIOContext *pb = &s->pb; int ret; @@ -609,7 +609,7 @@ static int ipmovie_read_close(AVFormatContext *s) { -// IPMVEContext *ipmovie = (IPMVEContext *)s->priv_data; +// IPMVEContext *ipmovie = s->priv_data; return 0; } diff -r fb04036147f8 -r 2f0154760e5f mm.c --- a/mm.c Sun Apr 08 20:21:11 2007 +0000 +++ b/mm.c Sun Apr 08 20:24:16 2007 +0000 @@ -71,7 +71,7 @@ static int mm_read_header(AVFormatContext *s, AVFormatParameters *ap) { - MmDemuxContext *mm = (MmDemuxContext *)s->priv_data; + MmDemuxContext *mm = s->priv_data; ByteIOContext *pb = &s->pb; AVStream *st; @@ -126,7 +126,7 @@ static int mm_read_packet(AVFormatContext *s, AVPacket *pkt) { - MmDemuxContext *mm = (MmDemuxContext *)s->priv_data; + MmDemuxContext *mm = s->priv_data; ByteIOContext *pb = &s->pb; unsigned char preamble[MM_PREAMBLE_SIZE]; unsigned char pal[MM_PALETTE_SIZE]; diff -r fb04036147f8 -r 2f0154760e5f mov.c --- a/mov.c Sun Apr 08 20:21:11 2007 +0000 +++ b/mov.c Sun Apr 08 20:24:16 2007 +0000 @@ -361,7 +361,7 @@ static int mov_read_esds(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) { AVStream *st = c->fc->streams[c->fc->nb_streams-1]; - MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; + MOVStreamContext *sc = st->priv_data; int tag, len; /* Well, broken but suffisant for some MP4 streams */ @@ -447,7 +447,7 @@ static int mov_read_mdhd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) { AVStream *st = c->fc->streams[c->fc->nb_streams-1]; - MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; + MOVStreamContext *sc = st->priv_data; int version = get_byte(pb); int lang; @@ -618,7 +618,7 @@ static int mov_read_stco(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) { AVStream *st = c->fc->streams[c->fc->nb_streams-1]; - MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; + MOVStreamContext *sc = st->priv_data; unsigned int i, entries; get_byte(pb); /* version */ @@ -650,7 +650,7 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) { AVStream *st = c->fc->streams[c->fc->nb_streams-1]; - MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; + MOVStreamContext *sc = st->priv_data; int entries, frames_per_sample; uint32_t format; uint8_t codec_name[32]; @@ -939,7 +939,7 @@ static int mov_read_stsc(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) { AVStream *st = c->fc->streams[c->fc->nb_streams-1]; - MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; + MOVStreamContext *sc = st->priv_data; unsigned int i, entries; get_byte(pb); /* version */ @@ -968,7 +968,7 @@ static int mov_read_stss(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) { AVStream *st = c->fc->streams[c->fc->nb_streams-1]; - MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; + MOVStreamContext *sc = st->priv_data; unsigned int i, entries; get_byte(pb); /* version */ @@ -998,7 +998,7 @@ static int mov_read_stsz(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) { AVStream *st = c->fc->streams[c->fc->nb_streams-1]; - MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; + MOVStreamContext *sc = st->priv_data; unsigned int i, entries, sample_size; get_byte(pb); /* version */ @@ -1033,7 +1033,7 @@ static int mov_read_stts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) { AVStream *st = c->fc->streams[c->fc->nb_streams-1]; - MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; + MOVStreamContext *sc = st->priv_data; unsigned int i, entries; int64_t duration=0; int64_t total_sample_count=0; @@ -1079,7 +1079,7 @@ static int mov_read_ctts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) { AVStream *st = c->fc->streams[c->fc->nb_streams-1]; - MOVStreamContext *sc = (MOVStreamContext *)st->priv_data; + MOVStreamContext *sc = st->priv_data; unsigned int i, entries; get_byte(pb); /* version */ @@ -1471,7 +1471,7 @@ static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap) { - MOVContext *mov = (MOVContext *) s->priv_data; + MOVContext *mov = s->priv_data; ByteIOContext *pb = &s->pb; int i, err; MOV_atom_t atom = { 0, 0, 0 }; @@ -1664,7 +1664,7 @@ static int mov_read_close(AVFormatContext *s) { int i; - MOVContext *mov = (MOVContext *) s->priv_data; + MOVContext *mov = s->priv_data; for(i=0; itotal_streams; i++) mov_free_stream_context(mov->streams[i]); /* free color tabs */ diff -r fb04036147f8 -r 2f0154760e5f nuv.c --- a/nuv.c Sun Apr 08 20:21:11 2007 +0000 +++ b/nuv.c Sun Apr 08 20:24:16 2007 +0000 @@ -115,7 +115,7 @@ } static int nuv_header(AVFormatContext *s, AVFormatParameters *ap) { - NUVContext *ctx = (NUVContext *)s->priv_data; + NUVContext *ctx = s->priv_data; ByteIOContext *pb = &s->pb; char id_string[12], version_string[5]; double aspect, fps; @@ -178,7 +178,7 @@ #define HDRSIZE 12 static int nuv_packet(AVFormatContext *s, AVPacket *pkt) { - NUVContext *ctx = (NUVContext *)s->priv_data; + NUVContext *ctx = s->priv_data; ByteIOContext *pb = &s->pb; uint8_t hdr[HDRSIZE]; frametype_t frametype; diff -r fb04036147f8 -r 2f0154760e5f psxstr.c --- a/psxstr.c Sun Apr 08 20:21:11 2007 +0000 +++ b/psxstr.c Sun Apr 08 20:24:16 2007 +0000 @@ -126,7 +126,7 @@ AVFormatParameters *ap) { ByteIOContext *pb = &s->pb; - StrDemuxContext *str = (StrDemuxContext *)s->priv_data; + StrDemuxContext *str = s->priv_data; AVStream *st; unsigned char sector[RAW_CD_SECTOR_SIZE]; int start; @@ -250,7 +250,7 @@ AVPacket *ret_pkt) { ByteIOContext *pb = &s->pb; - StrDemuxContext *str = (StrDemuxContext *)s->priv_data; + StrDemuxContext *str = s->priv_data; unsigned char sector[RAW_CD_SECTOR_SIZE]; int channel; int packet_read = 0; @@ -346,7 +346,7 @@ static int str_read_close(AVFormatContext *s) { - StrDemuxContext *str = (StrDemuxContext *)s->priv_data; + StrDemuxContext *str = s->priv_data; av_free(str->video_chunk); diff -r fb04036147f8 -r 2f0154760e5f segafilm.c --- a/segafilm.c Sun Apr 08 20:21:11 2007 +0000 +++ b/segafilm.c Sun Apr 08 20:24:16 2007 +0000 @@ -75,7 +75,7 @@ static int film_read_header(AVFormatContext *s, AVFormatParameters *ap) { - FilmDemuxContext *film = (FilmDemuxContext *)s->priv_data; + FilmDemuxContext *film = s->priv_data; ByteIOContext *pb = &s->pb; AVStream *st; unsigned char scratch[256]; @@ -203,7 +203,7 @@ static int film_read_packet(AVFormatContext *s, AVPacket *pkt) { - FilmDemuxContext *film = (FilmDemuxContext *)s->priv_data; + FilmDemuxContext *film = s->priv_data; ByteIOContext *pb = &s->pb; film_sample_t *sample; int ret = 0; @@ -273,7 +273,7 @@ static int film_read_close(AVFormatContext *s) { - FilmDemuxContext *film = (FilmDemuxContext *)s->priv_data; + FilmDemuxContext *film = s->priv_data; av_free(film->sample_table); av_free(film->stereo_buffer); diff -r fb04036147f8 -r 2f0154760e5f sierravmd.c --- a/sierravmd.c Sun Apr 08 20:21:11 2007 +0000 +++ b/sierravmd.c Sun Apr 08 20:24:16 2007 +0000 @@ -71,7 +71,7 @@ static int vmd_read_header(AVFormatContext *s, AVFormatParameters *ap) { - VmdDemuxContext *vmd = (VmdDemuxContext *)s->priv_data; + VmdDemuxContext *vmd = s->priv_data; ByteIOContext *pb = &s->pb; AVStream *st, *vst; unsigned int toc_offset; @@ -244,7 +244,7 @@ static int vmd_read_packet(AVFormatContext *s, AVPacket *pkt) { - VmdDemuxContext *vmd = (VmdDemuxContext *)s->priv_data; + VmdDemuxContext *vmd = s->priv_data; ByteIOContext *pb = &s->pb; int ret = 0; vmd_frame_t *frame; @@ -281,7 +281,7 @@ static int vmd_read_close(AVFormatContext *s) { - VmdDemuxContext *vmd = (VmdDemuxContext *)s->priv_data; + VmdDemuxContext *vmd = s->priv_data; av_free(vmd->frame_table); diff -r fb04036147f8 -r 2f0154760e5f smacker.c --- a/smacker.c Sun Apr 08 20:21:11 2007 +0000 +++ b/smacker.c Sun Apr 08 20:24:16 2007 +0000 @@ -98,7 +98,7 @@ static int smacker_read_header(AVFormatContext *s, AVFormatParameters *ap) { ByteIOContext *pb = &s->pb; - SmackerContext *smk = (SmackerContext *)s->priv_data; + SmackerContext *smk = s->priv_data; AVStream *st, *ast[7]; int i, ret; int tbase; @@ -215,7 +215,7 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt) { - SmackerContext *smk = (SmackerContext *)s->priv_data; + SmackerContext *smk = s->priv_data; int flags; int ret; int i; @@ -318,7 +318,7 @@ static int smacker_read_close(AVFormatContext *s) { - SmackerContext *smk = (SmackerContext *)s->priv_data; + SmackerContext *smk = s->priv_data; int i; for(i = 0; i < 7; i++) diff -r fb04036147f8 -r 2f0154760e5f tiertexseq.c --- a/tiertexseq.c Sun Apr 08 20:21:11 2007 +0000 +++ b/tiertexseq.c Sun Apr 08 20:24:16 2007 +0000 @@ -183,7 +183,7 @@ static int seq_read_header(AVFormatContext *s, AVFormatParameters *ap) { int i, rc; - SeqDemuxContext *seq = (SeqDemuxContext *)s->priv_data; + SeqDemuxContext *seq = s->priv_data; ByteIOContext *pb = &s->pb; AVStream *st; @@ -240,7 +240,7 @@ static int seq_read_packet(AVFormatContext *s, AVPacket *pkt) { int rc; - SeqDemuxContext *seq = (SeqDemuxContext *)s->priv_data; + SeqDemuxContext *seq = s->priv_data; ByteIOContext *pb = &s->pb; if (!seq->audio_buffer_full) { @@ -294,7 +294,7 @@ static int seq_read_close(AVFormatContext *s) { int i; - SeqDemuxContext *seq = (SeqDemuxContext *)s->priv_data; + SeqDemuxContext *seq = s->priv_data; for (i = 0; i < SEQ_NUM_FRAME_BUFFERS; i++) av_free(seq->frame_buffers[i].data); diff -r fb04036147f8 -r 2f0154760e5f wc3movie.c --- a/wc3movie.c Sun Apr 08 20:21:11 2007 +0000 +++ b/wc3movie.c Sun Apr 08 20:24:16 2007 +0000 @@ -125,7 +125,7 @@ static int wc3_read_header(AVFormatContext *s, AVFormatParameters *ap) { - Wc3DemuxContext *wc3 = (Wc3DemuxContext *)s->priv_data; + Wc3DemuxContext *wc3 = s->priv_data; ByteIOContext *pb = &s->pb; unsigned int fourcc_tag; unsigned int size; @@ -271,7 +271,7 @@ static int wc3_read_packet(AVFormatContext *s, AVPacket *pkt) { - Wc3DemuxContext *wc3 = (Wc3DemuxContext *)s->priv_data; + Wc3DemuxContext *wc3 = s->priv_data; ByteIOContext *pb = &s->pb; unsigned int fourcc_tag; unsigned int size; @@ -376,7 +376,7 @@ static int wc3_read_close(AVFormatContext *s) { - Wc3DemuxContext *wc3 = (Wc3DemuxContext *)s->priv_data; + Wc3DemuxContext *wc3 = s->priv_data; av_free(wc3->palettes); diff -r fb04036147f8 -r 2f0154760e5f westwood.c --- a/westwood.c Sun Apr 08 20:21:11 2007 +0000 +++ b/westwood.c Sun Apr 08 20:24:16 2007 +0000 @@ -117,7 +117,7 @@ static int wsaud_read_header(AVFormatContext *s, AVFormatParameters *ap) { - WsAudDemuxContext *wsaud = (WsAudDemuxContext *)s->priv_data; + WsAudDemuxContext *wsaud = s->priv_data; ByteIOContext *pb = &s->pb; AVStream *st; unsigned char header[AUD_HEADER_SIZE]; @@ -159,7 +159,7 @@ static int wsaud_read_packet(AVFormatContext *s, AVPacket *pkt) { - WsAudDemuxContext *wsaud = (WsAudDemuxContext *)s->priv_data; + WsAudDemuxContext *wsaud = s->priv_data; ByteIOContext *pb = &s->pb; unsigned char preamble[AUD_CHUNK_PREAMBLE_SIZE]; unsigned int chunk_size; @@ -189,7 +189,7 @@ static int wsaud_read_close(AVFormatContext *s) { -// WsAudDemuxContext *wsaud = (WsAudDemuxContext *)s->priv_data; +// WsAudDemuxContext *wsaud = s->priv_data; return 0; } @@ -212,7 +212,7 @@ static int wsvqa_read_header(AVFormatContext *s, AVFormatParameters *ap) { - WsVqaDemuxContext *wsvqa = (WsVqaDemuxContext *)s->priv_data; + WsVqaDemuxContext *wsvqa = s->priv_data; ByteIOContext *pb = &s->pb; AVStream *st; unsigned char *header; @@ -314,7 +314,7 @@ static int wsvqa_read_packet(AVFormatContext *s, AVPacket *pkt) { - WsVqaDemuxContext *wsvqa = (WsVqaDemuxContext *)s->priv_data; + WsVqaDemuxContext *wsvqa = s->priv_data; ByteIOContext *pb = &s->pb; int ret = -1; unsigned char preamble[VQA_PREAMBLE_SIZE]; @@ -371,7 +371,7 @@ static int wsvqa_read_close(AVFormatContext *s) { -// WsVqaDemuxContext *wsvqa = (WsVqaDemuxContext *)s->priv_data; +// WsVqaDemuxContext *wsvqa = s->priv_data; return 0; }