Get rid of unnecessary pointer casts.

patch by Nicholas Tung, ntung ntung com

Originally committed as revision 8687 to svn://svn.ffmpeg.org/ffmpeg/trunk

18 files changed, 58 insertions, 58 deletions

diff --git a/libavformat/4xm.c b/libavformat/4xm.c
index e3e3a9f799..2e23e18746 100644
--- a/libavformat/4xm.c
+++ b/libavformat/4xm.c
@@ -93,7 +93,7 @@ static int fourxm_read_header(AVFormatContext *s,
     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_packet(AVFormatContext *s,
 
 static int fourxm_read_close(AVFormatContext *s)
 {
-    FourxmDemuxContext *fourxm = (FourxmDemuxContext *)s->priv_data;
+    FourxmDemuxContext *fourxm = s->priv_data;
 
     av_free(fourxm->tracks);
 
diff --git a/libavformat/dsicin.c b/libavformat/dsicin.c
index 61e5e39a3a..4a66c45b2e 100644
--- a/libavformat/dsicin.c
+++ b/libavformat/dsicin.c
@@ -92,7 +92,7 @@ static int cin_read_file_header(CinDemuxContext *cin, ByteIOContext *pb) {
 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_frame_header(CinDemuxContext *cin, ByteIOContext *pb) {
 
 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 --git a/libavformat/dvenc.c b/libavformat/dvenc.c
index bdac43784c..a660fb5479 100644
--- a/libavformat/dvenc.c
+++ b/libavformat/dvenc.c
@@ -283,7 +283,7 @@ int dv_assemble_frame(DVMuxContext *c, AVStream* st,
 
 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 @@ static int dv_write_packet(struct AVFormatContext *s, AVPacket *pkt)
     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_packet(struct AVFormatContext *s, AVPacket *pkt)
  */
 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 --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c
index e140d494bb..2b66c739c0 100644
--- a/libavformat/electronicarts.c
+++ b/libavformat/electronicarts.c
@@ -80,7 +80,7 @@ static uint32_t read_arbitary(ByteIOContext *pb) {
 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_probe(AVProbeData *p)
 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_packet(AVFormatContext *s,
 
 static int ea_read_close(AVFormatContext *s)
 {
-//    EaDemuxContext *ea = (EaDemuxContext *)s->priv_data;
+//    EaDemuxContext *ea = s->priv_data;
 
     return 0;
 }
diff --git a/libavformat/flic.c b/libavformat/flic.c
index d5544b5e0a..2c3754f0ff 100644
--- a/libavformat/flic.c
+++ b/libavformat/flic.c
@@ -67,7 +67,7 @@ static int flic_probe(AVProbeData *p)
 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_header(AVFormatContext *s,
 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_packet(AVFormatContext *s,
 
 static int flic_read_close(AVFormatContext *s)
 {
-//    FlicDemuxContext *flic = (FlicDemuxContext *)s->priv_data;
+//    FlicDemuxContext *flic = s->priv_data;
 
     return 0;
 }
diff --git a/libavformat/idcin.c b/libavformat/idcin.c
index f0f4427008..5f2c9cffd8 100644
--- a/libavformat/idcin.c
+++ b/libavformat/idcin.c
@@ -137,7 +137,7 @@ static int idcin_read_header(AVFormatContext *s,
                              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 @@ static int idcin_read_packet(AVFormatContext *s,
     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 --git a/libavformat/idroq.c b/libavformat/idroq.c
index ddda86fec8..27dc081668 100644
--- a/libavformat/idroq.c
+++ b/libavformat/idroq.c
@@ -272,7 +272,7 @@ static int roq_read_packet(AVFormatContext *s,
 
 static int roq_read_close(AVFormatContext *s)
 {
-//    RoqDemuxContext *roq = (RoqDemuxContext *)s->priv_data;
+//    RoqDemuxContext *roq = s->priv_data;
 
     return 0;
 }
diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c
index 06585dfb6a..cd1f98abd4 100644
--- a/libavformat/ipmovie.c
+++ b/libavformat/ipmovie.c
@@ -516,7 +516,7 @@ static int ipmovie_probe(AVProbeData *p)
 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_header(AVFormatContext *s,
 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_packet(AVFormatContext *s,
 
 static int ipmovie_read_close(AVFormatContext *s)
 {
-//    IPMVEContext *ipmovie = (IPMVEContext *)s->priv_data;
+//    IPMVEContext *ipmovie = s->priv_data;
 
     return 0;
 }
diff --git a/libavformat/mm.c b/libavformat/mm.c
index a7a67e9f00..304d3188ec 100644
--- a/libavformat/mm.c
+++ b/libavformat/mm.c
@@ -71,7 +71,7 @@ static int mm_probe(AVProbeData *p)
 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_header(AVFormatContext *s,
 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 --git a/libavformat/mov.c b/libavformat/mov.c
index b138e3c523..aff43c2e54 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -361,7 +361,7 @@ static int mov_mp4_read_descr(MOVContext *c, ByteIOContext *pb, int *tag)
 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_moov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 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_avcC(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 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_stco(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 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_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 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 @@ av_log(NULL, AV_LOG_DEBUG, "track[%i].stsc.entries = %i\n", c->fc->nb_streams-1,
 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_stss(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 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_stsz(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 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 @@ av_log(NULL, AV_LOG_DEBUG, "track[%i].stts.entries = %i\n", c->fc->nb_streams-1,
 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 void mov_build_index(MOVContext *mov, AVStream *st)
 
 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_seek(AVFormatContext *s, int stream_index, int64_t sample_ti
 static int mov_read_close(AVFormatContext *s)
 {
     int i;
-    MOVContext *mov = (MOVContext *) s->priv_data;
+    MOVContext *mov = s->priv_data;
     for(i=0; i<mov->total_streams; i++)
         mov_free_stream_context(mov->streams[i]);
     /* free color tabs */
diff --git a/libavformat/nuv.c b/libavformat/nuv.c
index feb1d3060a..cd5ece7749 100644
--- a/libavformat/nuv.c
+++ b/libavformat/nuv.c
@@ -115,7 +115,7 @@ static int get_codec_data(ByteIOContext *pb, AVStream *vst,
 }
 
 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 @@ static int nuv_header(AVFormatContext *s, AVFormatParameters *ap) {
 #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 --git a/libavformat/psxstr.c b/libavformat/psxstr.c
index 2f1a3dc735..d6f1db1d04 100644
--- a/libavformat/psxstr.c
+++ b/libavformat/psxstr.c
@@ -126,7 +126,7 @@ static int str_read_header(AVFormatContext *s,
                            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 @@ static int str_read_packet(AVFormatContext *s,
                            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 @@ printf (" dropping other sector\n");
 
 static int str_read_close(AVFormatContext *s)
 {
-    StrDemuxContext *str = (StrDemuxContext *)s->priv_data;
+    StrDemuxContext *str = s->priv_data;
 
     av_free(str->video_chunk);
 
diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c
index 5990047f0b..55fb9d9ad1 100644
--- a/libavformat/segafilm.c
+++ b/libavformat/segafilm.c
@@ -75,7 +75,7 @@ static int film_probe(AVProbeData *p)
 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_header(AVFormatContext *s,
 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_packet(AVFormatContext *s,
 
 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 --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c
index eba0bbb9e3..15ce40f688 100644
--- a/libavformat/sierravmd.c
+++ b/libavformat/sierravmd.c
@@ -71,7 +71,7 @@ static int vmd_probe(AVProbeData *p)
 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_header(AVFormatContext *s,
 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_packet(AVFormatContext *s,
 
 static int vmd_read_close(AVFormatContext *s)
 {
-    VmdDemuxContext *vmd = (VmdDemuxContext *)s->priv_data;
+    VmdDemuxContext *vmd = s->priv_data;
 
     av_free(vmd->frame_table);
 
diff --git a/libavformat/smacker.c b/libavformat/smacker.c
index 7a784c7d4c..9c98d311a0 100644
--- a/libavformat/smacker.c
+++ b/libavformat/smacker.c
@@ -98,7 +98,7 @@ static int smacker_probe(AVProbeData *p)
 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_header(AVFormatContext *s, AVFormatParameters *ap)
 
 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_packet(AVFormatContext *s, AVPacket *pkt)
 
 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 --git a/libavformat/tiertexseq.c b/libavformat/tiertexseq.c
index 8f565824a6..6a60da4dd9 100644
--- a/libavformat/tiertexseq.c
+++ b/libavformat/tiertexseq.c
@@ -183,7 +183,7 @@ static int seq_parse_frame_data(SeqDemuxContext *seq, ByteIOContext *pb)
 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_header(AVFormatContext *s, AVFormatParameters *ap)
 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_packet(AVFormatContext *s, AVPacket *pkt)
 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 --git a/libavformat/wc3movie.c b/libavformat/wc3movie.c
index 3e58a1bbae..c87007050a 100644
--- a/libavformat/wc3movie.c
+++ b/libavformat/wc3movie.c
@@ -125,7 +125,7 @@ static int wc3_probe(AVProbeData *p)
 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_header(AVFormatContext *s,
 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_packet(AVFormatContext *s,
 
 static int wc3_read_close(AVFormatContext *s)
 {
-    Wc3DemuxContext *wc3 = (Wc3DemuxContext *)s->priv_data;
+    Wc3DemuxContext *wc3 = s->priv_data;
 
     av_free(wc3->palettes);
 
diff --git a/libavformat/westwood.c b/libavformat/westwood.c
index bed2f0d147..2c546f66c8 100644
--- a/libavformat/westwood.c
+++ b/libavformat/westwood.c
@@ -117,7 +117,7 @@ static int wsaud_probe(AVProbeData *p)
 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_header(AVFormatContext *s,
 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_packet(AVFormatContext *s,
 
 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_probe(AVProbeData *p)
 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_header(AVFormatContext *s,
 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_packet(AVFormatContext *s,
 
 static int wsvqa_read_close(AVFormatContext *s)
 {
-//    WsVqaDemuxContext *wsvqa = (WsVqaDemuxContext *)s->priv_data;
+//    WsVqaDemuxContext *wsvqa = s->priv_data;
 
     return 0;
 }