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

46 files changed, 147 insertions, 147 deletions

diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c
index 5f68fcc039..961e46215e 100644
--- a/libavcodec/8bps.c
+++ b/libavcodec/8bps.c
@@ -61,7 +61,7 @@ typedef struct EightBpsContext {
  */
 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size)
 {
-        EightBpsContext * const c = (EightBpsContext *)avctx->priv_data;
+        EightBpsContext * const c = avctx->priv_data;
         unsigned char *encoded = (unsigned char *)buf;
         unsigned char *pixptr, *pixptr_end;
         unsigned int height = avctx->height; // Real image height
@@ -152,7 +152,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8
  */
 static int decode_init(AVCodecContext *avctx)
 {
-        EightBpsContext * const c = (EightBpsContext *)avctx->priv_data;
+        EightBpsContext * const c = avctx->priv_data;
 
         c->avctx = avctx;
 
@@ -212,7 +212,7 @@ static int decode_init(AVCodecContext *avctx)
  */
 static int decode_end(AVCodecContext *avctx)
 {
-        EightBpsContext * const c = (EightBpsContext *)avctx->priv_data;
+        EightBpsContext * const c = avctx->priv_data;
 
         if (c->pic.data[0])
                 avctx->release_buffer(avctx, &c->pic);
diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c
index 8f26fae87d..f720f3eddb 100644
--- a/libavcodec/aasc.c
+++ b/libavcodec/aasc.c
@@ -47,7 +47,7 @@ typedef struct AascContext {
 
 static int aasc_decode_init(AVCodecContext *avctx)
 {
-    AascContext *s = (AascContext *)avctx->priv_data;
+    AascContext *s = avctx->priv_data;
 
     s->avctx = avctx;
 
@@ -61,7 +61,7 @@ static int aasc_decode_frame(AVCodecContext *avctx,
                               void *data, int *data_size,
                               uint8_t *buf, int buf_size)
 {
-    AascContext *s = (AascContext *)avctx->priv_data;
+    AascContext *s = avctx->priv_data;
     int stream_ptr = 4;
     unsigned char rle_code;
     unsigned char stream_byte;
@@ -153,7 +153,7 @@ static int aasc_decode_frame(AVCodecContext *avctx,
 
 static int aasc_decode_end(AVCodecContext *avctx)
 {
-    AascContext *s = (AascContext *)avctx->priv_data;
+    AascContext *s = avctx->priv_data;
 
     /* release the last frame */
     if (s->frame.data[0])
diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
index 5a6de9309d..012986bdf1 100644
--- a/libavcodec/cinepak.c
+++ b/libavcodec/cinepak.c
@@ -391,7 +391,7 @@ static int cinepak_decode (CinepakContext *s)
 
 static int cinepak_decode_init(AVCodecContext *avctx)
 {
-    CinepakContext *s = (CinepakContext *)avctx->priv_data;
+    CinepakContext *s = avctx->priv_data;
 
     s->avctx = avctx;
     s->width = (avctx->width + 3) & ~3;
@@ -418,7 +418,7 @@ static int cinepak_decode_frame(AVCodecContext *avctx,
                                 void *data, int *data_size,
                                 uint8_t *buf, int buf_size)
 {
-    CinepakContext *s = (CinepakContext *)avctx->priv_data;
+    CinepakContext *s = avctx->priv_data;
 
     s->data = buf;
     s->size = buf_size;
@@ -451,7 +451,7 @@ static int cinepak_decode_frame(AVCodecContext *avctx,
 
 static int cinepak_decode_end(AVCodecContext *avctx)
 {
-    CinepakContext *s = (CinepakContext *)avctx->priv_data;
+    CinepakContext *s = avctx->priv_data;
 
     if (s->frame.data[0])
         avctx->release_buffer(avctx, &s->frame);
diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c
index bda359f597..6177cbd429 100644
--- a/libavcodec/cscd.c
+++ b/libavcodec/cscd.c
@@ -137,7 +137,7 @@ static void add_frame_32(AVFrame *f, uint8_t *src,
 
 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
                         uint8_t *buf, int buf_size) {
-    CamStudioContext *c = (CamStudioContext *)avctx->priv_data;
+    CamStudioContext *c = avctx->priv_data;
     AVFrame *picture = data;
 
     if (buf_size < 2) {
@@ -214,7 +214,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
 }
 
 static int decode_init(AVCodecContext *avctx) {
-    CamStudioContext *c = (CamStudioContext *)avctx->priv_data;
+    CamStudioContext *c = avctx->priv_data;
     if (avcodec_check_dimensions(avctx, avctx->height, avctx->width) < 0) {
         return 1;
     }
@@ -242,7 +242,7 @@ static int decode_init(AVCodecContext *avctx) {
 }
 
 static int decode_end(AVCodecContext *avctx) {
-    CamStudioContext *c = (CamStudioContext *)avctx->priv_data;
+    CamStudioContext *c = avctx->priv_data;
     av_freep(&c->decomp_buf);
     if (c->pic.data[0])
         avctx->release_buffer(avctx, &c->pic);
diff --git a/libavcodec/dsicinav.c b/libavcodec/dsicinav.c
index df2db86b9b..30027b1d92 100644
--- a/libavcodec/dsicinav.c
+++ b/libavcodec/dsicinav.c
@@ -88,7 +88,7 @@ static const int16_t cinaudio_delta16_table[256] = {
 
 static int cinvideo_decode_init(AVCodecContext *avctx)
 {
-    CinVideoContext *cin = (CinVideoContext *)avctx->priv_data;
+    CinVideoContext *cin = avctx->priv_data;
     unsigned int i;
 
     cin->avctx = avctx;
@@ -197,7 +197,7 @@ static int cinvideo_decode_frame(AVCodecContext *avctx,
                                  void *data, int *data_size,
                                  uint8_t *buf, int buf_size)
 {
-    CinVideoContext *cin = (CinVideoContext *)avctx->priv_data;
+    CinVideoContext *cin = avctx->priv_data;
     int i, y, palette_type, palette_colors_count, bitmap_frame_type, bitmap_frame_size;
 
     cin->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
@@ -287,7 +287,7 @@ static int cinvideo_decode_frame(AVCodecContext *avctx,
 
 static int cinvideo_decode_end(AVCodecContext *avctx)
 {
-    CinVideoContext *cin = (CinVideoContext *)avctx->priv_data;
+    CinVideoContext *cin = avctx->priv_data;
     int i;
 
     if (cin->frame.data[0])
@@ -301,7 +301,7 @@ static int cinvideo_decode_end(AVCodecContext *avctx)
 
 static int cinaudio_decode_init(AVCodecContext *avctx)
 {
-    CinAudioContext *cin = (CinAudioContext *)avctx->priv_data;
+    CinAudioContext *cin = avctx->priv_data;
 
     cin->avctx = avctx;
     cin->initial_decode_frame = 1;
@@ -314,7 +314,7 @@ static int cinaudio_decode_frame(AVCodecContext *avctx,
                                  void *data, int *data_size,
                                  uint8_t *buf, int buf_size)
 {
-    CinAudioContext *cin = (CinAudioContext *)avctx->priv_data;
+    CinAudioContext *cin = avctx->priv_data;
     uint8_t *src = buf;
     int16_t *samples = (int16_t *)data;
 
diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c
index fc201ccb4a..7675e71954 100644
--- a/libavcodec/dxa.c
+++ b/libavcodec/dxa.c
@@ -191,7 +191,7 @@ static int decode_13(AVCodecContext *avctx, DxaDecContext *c, uint8_t* dst, uint
 
 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size)
 {
-    DxaDecContext * const c = (DxaDecContext *)avctx->priv_data;
+    DxaDecContext * const c = avctx->priv_data;
     uint8_t *outptr, *srcptr, *tmpptr;
     unsigned long dsize;
     int i, j, compr;
@@ -289,7 +289,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8
 
 static int decode_init(AVCodecContext *avctx)
 {
-    DxaDecContext * const c = (DxaDecContext *)avctx->priv_data;
+    DxaDecContext * const c = avctx->priv_data;
 
     c->avctx = avctx;
     avctx->pix_fmt = PIX_FMT_PAL8;
@@ -309,7 +309,7 @@ static int decode_init(AVCodecContext *avctx)
 
 static int decode_end(AVCodecContext *avctx)
 {
-    DxaDecContext * const c = (DxaDecContext *)avctx->priv_data;
+    DxaDecContext * const c = avctx->priv_data;
 
     av_freep(&c->decomp_buf);
     if(c->prev.data[0])
diff --git a/libavcodec/faad.c b/libavcodec/faad.c
index 01cbd40e7c..672a975eeb 100644
--- a/libavcodec/faad.c
+++ b/libavcodec/faad.c
@@ -103,7 +103,7 @@ static const unsigned long faac_srates[] =
 
 static int faac_init_mp4(AVCodecContext *avctx)
 {
-    FAACContext *s = (FAACContext *) avctx->priv_data;
+    FAACContext *s = avctx->priv_data;
     unsigned long samplerate;
 #ifndef FAAD2_VERSION
     unsigned long channels;
@@ -134,7 +134,7 @@ static int faac_decode_frame(AVCodecContext *avctx,
                              void *data, int *data_size,
                              uint8_t *buf, int buf_size)
 {
-    FAACContext *s = (FAACContext *) avctx->priv_data;
+    FAACContext *s = avctx->priv_data;
 #ifndef FAAD2_VERSION
     unsigned long bytesconsumed;
     short *sample_buffer = NULL;
@@ -194,7 +194,7 @@ static int faac_decode_frame(AVCodecContext *avctx,
 
 static int faac_decode_end(AVCodecContext *avctx)
 {
-    FAACContext *s = (FAACContext *) avctx->priv_data;
+    FAACContext *s = avctx->priv_data;
 
     s->faacDecClose(s->faac_handle);
 
@@ -204,7 +204,7 @@ static int faac_decode_end(AVCodecContext *avctx)
 
 static int faac_decode_init(AVCodecContext *avctx)
 {
-    FAACContext *s = (FAACContext *) avctx->priv_data;
+    FAACContext *s = avctx->priv_data;
     faacDecConfigurationPtr faac_cfg;
 
 #ifdef CONFIG_LIBFAADBIN
diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c
index 515085c028..41baf10717 100644
--- a/libavcodec/flashsv.c
+++ b/libavcodec/flashsv.c
@@ -82,7 +82,7 @@ static void copy_region(uint8_t *sptr, uint8_t *dptr,
 
 static int flashsv_decode_init(AVCodecContext *avctx)
 {
-    FlashSVContext *s = (FlashSVContext *)avctx->priv_data;
+    FlashSVContext *s = avctx->priv_data;
     int zret; // Zlib return code
 
     s->avctx = avctx;
@@ -105,7 +105,7 @@ static int flashsv_decode_frame(AVCodecContext *avctx,
                                     void *data, int *data_size,
                                     uint8_t *buf, int buf_size)
 {
-    FlashSVContext *s = (FlashSVContext *)avctx->priv_data;
+    FlashSVContext *s = avctx->priv_data;
     int h_blocks, v_blocks, h_part, v_part, i, j;
     GetBitContext gb;
 
@@ -231,7 +231,7 @@ static int flashsv_decode_frame(AVCodecContext *avctx,
 
 static int flashsv_decode_end(AVCodecContext *avctx)
 {
-    FlashSVContext *s = (FlashSVContext *)avctx->priv_data;
+    FlashSVContext *s = avctx->priv_data;
     inflateEnd(&(s->zstream));
     /* release the frame if needed */
     if (s->frame.data[0])
diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c
index cbf4883288..b975ed254b 100644
--- a/libavcodec/flashsvenc.c
+++ b/libavcodec/flashsvenc.c
@@ -100,7 +100,7 @@ static int copy_region_enc(uint8_t *sptr, uint8_t *dptr,
 
 static int flashsv_encode_init(AVCodecContext *avctx)
 {
-    FlashSVContext *s = (FlashSVContext *)avctx->priv_data;
+    FlashSVContext *s = avctx->priv_data;
 
     s->avctx = avctx;
 
@@ -232,7 +232,7 @@ static int encode_bitstream(FlashSVContext *s, AVFrame *p, uint8_t *buf, int buf
 
 static int flashsv_encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf_size, void *data)
 {
-    FlashSVContext * const s = (FlashSVContext *)avctx->priv_data;
+    FlashSVContext * const s = avctx->priv_data;
     AVFrame *pict = data;
     AVFrame * const p = &s->frame;
     int res;
@@ -322,7 +322,7 @@ static int flashsv_encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf_siz
 
 static int flashsv_encode_end(AVCodecContext *avctx)
 {
-    FlashSVContext *s = (FlashSVContext *)avctx->priv_data;
+    FlashSVContext *s = avctx->priv_data;
 
     deflateEnd(&(s->zstream));
 
diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c
index 9f8732ae3d..bb0577352c 100644
--- a/libavcodec/flicvideo.c
+++ b/libavcodec/flicvideo.c
@@ -80,7 +80,7 @@ typedef struct FlicDecodeContext {
 
 static int flic_decode_init(AVCodecContext *avctx)
 {
-    FlicDecodeContext *s = (FlicDecodeContext *)avctx->priv_data;
+    FlicDecodeContext *s = avctx->priv_data;
     unsigned char *fli_header = (unsigned char *)avctx->extradata;
     int depth;
 
@@ -128,7 +128,7 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx,
                                   void *data, int *data_size,
                                   uint8_t *buf, int buf_size)
 {
-    FlicDecodeContext *s = (FlicDecodeContext *)avctx->priv_data;
+    FlicDecodeContext *s = avctx->priv_data;
 
     int stream_ptr = 0;
     int stream_ptr_after_color_chunk;
@@ -430,7 +430,7 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
 {
     /* Note, the only difference between the 15Bpp and 16Bpp */
     /* Format is the pixel format, the packets are processed the same. */
-    FlicDecodeContext *s = (FlicDecodeContext *)avctx->priv_data;
+    FlicDecodeContext *s = avctx->priv_data;
 
     int stream_ptr = 0;
     int pixel_ptr;
diff --git a/libavcodec/idcinvideo.c b/libavcodec/idcinvideo.c
index a24f5e2d01..38f330c2e3 100644
--- a/libavcodec/idcinvideo.c
+++ b/libavcodec/idcinvideo.c
@@ -149,7 +149,7 @@ static void huff_build_tree(IdcinContext *s, int prev) {
 
 static int idcin_decode_init(AVCodecContext *avctx)
 {
-    IdcinContext *s = (IdcinContext *)avctx->priv_data;
+    IdcinContext *s = avctx->priv_data;
     int i, j, histogram_index = 0;
     unsigned char *histograms;
 
@@ -216,7 +216,7 @@ static int idcin_decode_frame(AVCodecContext *avctx,
                               void *data, int *data_size,
                               uint8_t *buf, int buf_size)
 {
-    IdcinContext *s = (IdcinContext *)avctx->priv_data;
+    IdcinContext *s = avctx->priv_data;
     AVPaletteControl *palette_control = avctx->palctrl;
 
     s->buf = buf;
@@ -249,7 +249,7 @@ static int idcin_decode_frame(AVCodecContext *avctx,
 
 static int idcin_decode_end(AVCodecContext *avctx)
 {
-    IdcinContext *s = (IdcinContext *)avctx->priv_data;
+    IdcinContext *s = avctx->priv_data;
 
     if (s->frame.data[0])
         avctx->release_buffer(avctx, &s->frame);
diff --git a/libavcodec/kmvc.c b/libavcodec/kmvc.c
index 08de05188e..8a190cb176 100644
--- a/libavcodec/kmvc.c
+++ b/libavcodec/kmvc.c
@@ -228,7 +228,7 @@ static void kmvc_decode_inter_8x8(KmvcContext * ctx, uint8_t * src, int w, int h
 static int decode_frame(AVCodecContext * avctx, void *data, int *data_size, uint8_t * buf,
                         int buf_size)
 {
-    KmvcContext *const ctx = (KmvcContext *) avctx->priv_data;
+    KmvcContext *const ctx = avctx->priv_data;
     uint8_t *out, *src;
     int i;
     int header;
@@ -342,7 +342,7 @@ static int decode_frame(AVCodecContext * avctx, void *data, int *data_size, uint
  */
 static int decode_init(AVCodecContext * avctx)
 {
-    KmvcContext *const c = (KmvcContext *) avctx->priv_data;
+    KmvcContext *const c = avctx->priv_data;
     int i;
 
     c->avctx = avctx;
@@ -394,7 +394,7 @@ static int decode_init(AVCodecContext * avctx)
  */
 static int decode_end(AVCodecContext * avctx)
 {
-    KmvcContext *const c = (KmvcContext *) avctx->priv_data;
+    KmvcContext *const c = avctx->priv_data;
 
     av_freep(&c->frm0);
     av_freep(&c->frm1);
diff --git a/libavcodec/lcl.c b/libavcodec/lcl.c
index b236c1092b..f214b0a8b2 100644
--- a/libavcodec/lcl.c
+++ b/libavcodec/lcl.c
@@ -200,7 +200,7 @@ static unsigned int mszh_decomp(unsigned char * srcptr, int srclen, unsigned cha
  */
 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size)
 {
-        LclContext * const c = (LclContext *)avctx->priv_data;
+        LclContext * const c = avctx->priv_data;
         unsigned char *encoded = (unsigned char *)buf;
     unsigned int pixel_ptr;
     int row, col;
@@ -617,7 +617,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
  */
 static int decode_init(AVCodecContext *avctx)
 {
-    LclContext * const c = (LclContext *)avctx->priv_data;
+    LclContext * const c = avctx->priv_data;
     unsigned int basesize = avctx->width * avctx->height;
     unsigned int max_basesize = ((avctx->width + 3) & ~3) * ((avctx->height + 3) & ~3);
     unsigned int max_decomp_size;
@@ -852,7 +852,7 @@ static int encode_init(AVCodecContext *avctx)
  */
 static int decode_end(AVCodecContext *avctx)
 {
-        LclContext * const c = (LclContext *)avctx->priv_data;
+        LclContext * const c = avctx->priv_data;
 
         if (c->pic.data[0])
                 avctx->release_buffer(avctx, &c->pic);
diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c
index ce1d3737f3..5cb206170b 100644
--- a/libavcodec/msrle.c
+++ b/libavcodec/msrle.c
@@ -239,7 +239,7 @@ static void msrle_decode_pal8(MsrleContext *s)
 
 static int msrle_decode_init(AVCodecContext *avctx)
 {
-    MsrleContext *s = (MsrleContext *)avctx->priv_data;
+    MsrleContext *s = avctx->priv_data;
 
     s->avctx = avctx;
 
@@ -253,7 +253,7 @@ static int msrle_decode_frame(AVCodecContext *avctx,
                               void *data, int *data_size,
                               uint8_t *buf, int buf_size)
 {
-    MsrleContext *s = (MsrleContext *)avctx->priv_data;
+    MsrleContext *s = avctx->priv_data;
 
     s->buf = buf;
     s->size = buf_size;
@@ -286,7 +286,7 @@ static int msrle_decode_frame(AVCodecContext *avctx,
 
 static int msrle_decode_end(AVCodecContext *avctx)
 {
-    MsrleContext *s = (MsrleContext *)avctx->priv_data;
+    MsrleContext *s = avctx->priv_data;
 
     /* release the last frame */
     if (s->frame.data[0])
diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c
index 531d0fc6f6..459a6c5c93 100644
--- a/libavcodec/msvideo1.c
+++ b/libavcodec/msvideo1.c
@@ -63,7 +63,7 @@ typedef struct Msvideo1Context {
 
 static int msvideo1_decode_init(AVCodecContext *avctx)
 {
-    Msvideo1Context *s = (Msvideo1Context *)avctx->priv_data;
+    Msvideo1Context *s = avctx->priv_data;
 
     s->avctx = avctx;
 
@@ -301,7 +301,7 @@ static int msvideo1_decode_frame(AVCodecContext *avctx,
                                 void *data, int *data_size,
                                 uint8_t *buf, int buf_size)
 {
-    Msvideo1Context *s = (Msvideo1Context *)avctx->priv_data;
+    Msvideo1Context *s = avctx->priv_data;
 
     s->buf = buf;
     s->size = buf_size;
@@ -327,7 +327,7 @@ static int msvideo1_decode_frame(AVCodecContext *avctx,
 
 static int msvideo1_decode_end(AVCodecContext *avctx)
 {
-    Msvideo1Context *s = (Msvideo1Context *)avctx->priv_data;
+    Msvideo1Context *s = avctx->priv_data;
 
     if (s->frame.data[0])
         avctx->release_buffer(avctx, &s->frame);
diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c
index c22618d9f8..e83927c99f 100644
--- a/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@@ -72,7 +72,7 @@ static int get_quant(AVCodecContext *avctx, NuvContext *c,
 
 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
                         uint8_t *buf, int buf_size) {
-    NuvContext *c = (NuvContext *)avctx->priv_data;
+    NuvContext *c = avctx->priv_data;
     AVFrame *picture = data;
     int orig_size = buf_size;
     enum {NUV_UNCOMPRESSED = '0', NUV_RTJPEG = '1',
@@ -170,7 +170,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
 }
 
 static int decode_init(AVCodecContext *avctx) {
-    NuvContext *c = (NuvContext *)avctx->priv_data;
+    NuvContext *c = avctx->priv_data;
     avctx->width = (avctx->width + 1) & ~1;
     avctx->height = (avctx->height + 1) & ~1;
     if (avcodec_check_dimensions(avctx, avctx->height, avctx->width) < 0) {
@@ -194,7 +194,7 @@ static int decode_init(AVCodecContext *avctx) {
 }
 
 static int decode_end(AVCodecContext *avctx) {
-    NuvContext *c = (NuvContext *)avctx->priv_data;
+    NuvContext *c = avctx->priv_data;
     av_freep(&c->decomp_buf);
     if (c->pic.data[0])
         avctx->release_buffer(avctx, &c->pic);
diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c
index b63112221d..5c6ccb4fb1 100644
--- a/libavcodec/qtrle.c
+++ b/libavcodec/qtrle.c
@@ -491,7 +491,7 @@ static void qtrle_decode_32bpp(QtrleContext *s)
 
 static int qtrle_decode_init(AVCodecContext *avctx)
 {
-    QtrleContext *s = (QtrleContext *)avctx->priv_data;
+    QtrleContext *s = avctx->priv_data;
 
     s->avctx = avctx;
     switch (avctx->bits_per_sample) {
@@ -534,7 +534,7 @@ static int qtrle_decode_frame(AVCodecContext *avctx,
                               void *data, int *data_size,
                               uint8_t *buf, int buf_size)
 {
-    QtrleContext *s = (QtrleContext *)avctx->priv_data;
+    QtrleContext *s = avctx->priv_data;
 
     s->buf = buf;
     s->size = buf_size;
@@ -607,7 +607,7 @@ static int qtrle_decode_frame(AVCodecContext *avctx,
 
 static int qtrle_decode_end(AVCodecContext *avctx)
 {
-    QtrleContext *s = (QtrleContext *)avctx->priv_data;
+    QtrleContext *s = avctx->priv_data;
 
     if (s->frame.data[0])
         avctx->release_buffer(avctx, &s->frame);
diff --git a/libavcodec/rpza.c b/libavcodec/rpza.c
index a97cf18e65..2a59109ac8 100644
--- a/libavcodec/rpza.c
+++ b/libavcodec/rpza.c
@@ -232,7 +232,7 @@ static void rpza_decode_stream(RpzaContext *s)
 
 static int rpza_decode_init(AVCodecContext *avctx)
 {
-    RpzaContext *s = (RpzaContext *)avctx->priv_data;
+    RpzaContext *s = avctx->priv_data;
 
     s->avctx = avctx;
     avctx->pix_fmt = PIX_FMT_RGB555;
@@ -247,7 +247,7 @@ static int rpza_decode_frame(AVCodecContext *avctx,
                              void *data, int *data_size,
                              uint8_t *buf, int buf_size)
 {
-    RpzaContext *s = (RpzaContext *)avctx->priv_data;
+    RpzaContext *s = avctx->priv_data;
 
     s->buf = buf;
     s->size = buf_size;
@@ -270,7 +270,7 @@ static int rpza_decode_frame(AVCodecContext *avctx,
 
 static int rpza_decode_end(AVCodecContext *avctx)
 {
-    RpzaContext *s = (RpzaContext *)avctx->priv_data;
+    RpzaContext *s = avctx->priv_data;
 
     if (s->frame.data[0])
         avctx->release_buffer(avctx, &s->frame);
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c
index ad1d447dcc..a079522eb4 100644
--- a/libavcodec/smacker.c
+++ b/libavcodec/smacker.c
@@ -348,7 +348,7 @@ static av_always_inline int smk_get_code(GetBitContext *gb, int *recode, int *la
 
 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size)
 {
-    SmackVContext * const smk = (SmackVContext *)avctx->priv_data;
+    SmackVContext * const smk = avctx->priv_data;
     uint8_t *out;
     uint32_t *pal;
     GetBitContext gb;
@@ -515,7 +515,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8
  */
 static int decode_init(AVCodecContext *avctx)
 {
-    SmackVContext * const c = (SmackVContext *)avctx->priv_data;
+    SmackVContext * const c = avctx->priv_data;
 
     c->avctx = avctx;
 
@@ -549,7 +549,7 @@ static int decode_init(AVCodecContext *avctx)
  */
 static int decode_end(AVCodecContext *avctx)
 {
-    SmackVContext * const smk = (SmackVContext *)avctx->priv_data;
+    SmackVContext * const smk = avctx->priv_data;
 
     av_freep(&smk->mmap_tbl);
     av_freep(&smk->mclr_tbl);
diff --git a/libavcodec/smc.c b/libavcodec/smc.c
index 8cafa6682b..7a617ec7d8 100644
--- a/libavcodec/smc.c
+++ b/libavcodec/smc.c
@@ -432,7 +432,7 @@ static void smc_decode_stream(SmcContext *s)
 
 static int smc_decode_init(AVCodecContext *avctx)
 {
-    SmcContext *s = (SmcContext *)avctx->priv_data;
+    SmcContext *s = avctx->priv_data;
 
     s->avctx = avctx;
     avctx->pix_fmt = PIX_FMT_PAL8;
@@ -447,7 +447,7 @@ static int smc_decode_frame(AVCodecContext *avctx,
                              void *data, int *data_size,
                              uint8_t *buf, int buf_size)
 {
-    SmcContext *s = (SmcContext *)avctx->priv_data;
+    SmcContext *s = avctx->priv_data;
 
     s->buf = buf;
     s->size = buf_size;
@@ -471,7 +471,7 @@ static int smc_decode_frame(AVCodecContext *avctx,
 
 static int smc_decode_end(AVCodecContext *avctx)
 {
-    SmcContext *s = (SmcContext *)avctx->priv_data;
+    SmcContext *s = avctx->priv_data;
 
     if (s->frame.data[0])
         avctx->release_buffer(avctx, &s->frame);
diff --git a/libavcodec/tiertexseqv.c b/libavcodec/tiertexseqv.c
index 5343d5fa52..c9229e5cce 100644
--- a/libavcodec/tiertexseqv.c
+++ b/libavcodec/tiertexseqv.c
@@ -176,7 +176,7 @@ static void seqvideo_decode(SeqVideoContext *seq, unsigned char *data, int data_
 
 static int seqvideo_decode_init(AVCodecContext *avctx)
 {
-    SeqVideoContext *seq = (SeqVideoContext *)avctx->priv_data;
+    SeqVideoContext *seq = avctx->priv_data;
 
     seq->avctx = avctx;
     avctx->pix_fmt = PIX_FMT_PAL8;
@@ -191,7 +191,7 @@ static int seqvideo_decode_frame(AVCodecContext *avctx,
                                  uint8_t *buf, int buf_size)
 {
 
-    SeqVideoContext *seq = (SeqVideoContext *)avctx->priv_data;
+    SeqVideoContext *seq = avctx->priv_data;
 
     seq->frame.reference = 1;
     seq->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
@@ -210,7 +210,7 @@ static int seqvideo_decode_frame(AVCodecContext *avctx,
 
 static int seqvideo_decode_end(AVCodecContext *avctx)
 {
-    SeqVideoContext *seq = (SeqVideoContext *)avctx->priv_data;
+    SeqVideoContext *seq = avctx->priv_data;
 
     if (seq->frame.data[0])
         avctx->release_buffer(avctx, &seq->frame);
diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c
index b0fb76f2ce..5e84a828c8 100644
--- a/libavcodec/truemotion1.c
+++ b/libavcodec/truemotion1.c
@@ -465,7 +465,7 @@ static int truemotion1_decode_header(TrueMotion1Context *s)
 
 static int truemotion1_decode_init(AVCodecContext *avctx)
 {
-    TrueMotion1Context *s = (TrueMotion1Context *)avctx->priv_data;
+    TrueMotion1Context *s = avctx->priv_data;
 
     s->avctx = avctx;
 
@@ -863,7 +863,7 @@ static int truemotion1_decode_frame(AVCodecContext *avctx,
                                     void *data, int *data_size,
                                     uint8_t *buf, int buf_size)
 {
-    TrueMotion1Context *s = (TrueMotion1Context *)avctx->priv_data;
+    TrueMotion1Context *s = avctx->priv_data;
 
     s->buf = buf;
     s->size = buf_size;
@@ -903,7 +903,7 @@ static int truemotion1_decode_frame(AVCodecContext *avctx,
 
 static int truemotion1_decode_end(AVCodecContext *avctx)
 {
-    TrueMotion1Context *s = (TrueMotion1Context *)avctx->priv_data;
+    TrueMotion1Context *s = avctx->priv_data;
 
     /* release the last frame */
     if (s->prev_frame.data[0])
diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c
index 1453eb568a..cc284088a5 100644
--- a/libavcodec/tscc.c
+++ b/libavcodec/tscc.c
@@ -186,7 +186,7 @@ static int decode_rle(CamtasiaContext *c, unsigned int srcsize)
  */
 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size)
 {
-    CamtasiaContext * const c = (CamtasiaContext *)avctx->priv_data;
+    CamtasiaContext * const c = avctx->priv_data;
     unsigned char *encoded = (unsigned char *)buf;
     unsigned char *outptr;
 #ifdef CONFIG_ZLIB
@@ -257,7 +257,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8
  */
 static int decode_init(AVCodecContext *avctx)
 {
-    CamtasiaContext * const c = (CamtasiaContext *)avctx->priv_data;
+    CamtasiaContext * const c = avctx->priv_data;
     int zret; // Zlib return code
 
     c->avctx = avctx;
@@ -320,7 +320,7 @@ static int decode_init(AVCodecContext *avctx)
  */
 static int decode_end(AVCodecContext *avctx)
 {
-    CamtasiaContext * const c = (CamtasiaContext *)avctx->priv_data;
+    CamtasiaContext * const c = avctx->priv_data;
 
     av_freep(&c->decomp_buf);
 
diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
index 746ae9dbac..f10d57b3d7 100644
--- a/libavcodec/vmdav.c
+++ b/libavcodec/vmdav.c
@@ -318,7 +318,7 @@ static void vmd_decode(VmdVideoContext *s)
 
 static int vmdvideo_decode_init(AVCodecContext *avctx)
 {
-    VmdVideoContext *s = (VmdVideoContext *)avctx->priv_data;
+    VmdVideoContext *s = avctx->priv_data;
     int i;
     unsigned int *palette32;
     int palette_index = 0;
@@ -362,7 +362,7 @@ static int vmdvideo_decode_frame(AVCodecContext *avctx,
                                  void *data, int *data_size,
                                  uint8_t *buf, int buf_size)
 {
-    VmdVideoContext *s = (VmdVideoContext *)avctx->priv_data;
+    VmdVideoContext *s = avctx->priv_data;
 
     s->buf = buf;
     s->size = buf_size;
@@ -396,7 +396,7 @@ static int vmdvideo_decode_frame(AVCodecContext *avctx,
 
 static int vmdvideo_decode_end(AVCodecContext *avctx)
 {
-    VmdVideoContext *s = (VmdVideoContext *)avctx->priv_data;
+    VmdVideoContext *s = avctx->priv_data;
 
     if (s->prev_frame.data[0])
         avctx->release_buffer(avctx, &s->prev_frame);
@@ -436,7 +436,7 @@ static uint16_t vmdaudio_table[128] = {
 
 static int vmdaudio_decode_init(AVCodecContext *avctx)
 {
-    VmdAudioContext *s = (VmdAudioContext *)avctx->priv_data;
+    VmdAudioContext *s = avctx->priv_data;
 
     s->avctx = avctx;
     s->channels = avctx->channels;
@@ -517,7 +517,7 @@ static int vmdaudio_decode_frame(AVCodecContext *avctx,
                                  void *data, int *data_size,
                                  uint8_t *buf, int buf_size)
 {
-    VmdAudioContext *s = (VmdAudioContext *)avctx->priv_data;
+    VmdAudioContext *s = avctx->priv_data;
     unsigned char *output_samples = (unsigned char *)data;
 
     /* point to the start of the encoded data */
diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c
index b430a7e667..e805ea0806 100644
--- a/libavcodec/vmnc.c
+++ b/libavcodec/vmnc.c
@@ -287,7 +287,7 @@ static int decode_hextile(VmncContext *c, uint8_t* dst, uint8_t* src, int ssize,
 
 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size)
 {
-    VmncContext * const c = (VmncContext *)avctx->priv_data;
+    VmncContext * const c = avctx->priv_data;
     uint8_t *outptr;
     uint8_t *src = buf;
     int dx, dy, w, h, depth, enc, chunks, res, size_left;
@@ -460,7 +460,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8
  */
 static int decode_init(AVCodecContext *avctx)
 {
-    VmncContext * const c = (VmncContext *)avctx->priv_data;
+    VmncContext * const c = avctx->priv_data;
 
     c->avctx = avctx;
 
@@ -500,7 +500,7 @@ static int decode_init(AVCodecContext *avctx)
  */
 static int decode_end(AVCodecContext *avctx)
 {
-    VmncContext * const c = (VmncContext *)avctx->priv_data;
+    VmncContext * const c = avctx->priv_data;
 
     if (c->pic.data[0])
         avctx->release_buffer(avctx, &c->pic);
diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c
index ced7f3dcd0..f266daf9f6 100644
--- a/libavcodec/vqavideo.c
+++ b/libavcodec/vqavideo.c
@@ -133,7 +133,7 @@ typedef struct VqaContext {
 
 static int vqa_decode_init(AVCodecContext *avctx)
 {
-    VqaContext *s = (VqaContext *)avctx->priv_data;
+    VqaContext *s = avctx->priv_data;
     unsigned char *vqa_header;
     int i, j, codebook_index;;
 
@@ -571,7 +571,7 @@ static int vqa_decode_frame(AVCodecContext *avctx,
                             void *data, int *data_size,
                             uint8_t *buf, int buf_size)
 {
-    VqaContext *s = (VqaContext *)avctx->priv_data;
+    VqaContext *s = avctx->priv_data;
 
     s->buf = buf;
     s->size = buf_size;
@@ -599,7 +599,7 @@ static int vqa_decode_frame(AVCodecContext *avctx,
 
 static int vqa_decode_end(AVCodecContext *avctx)
 {
-    VqaContext *s = (VqaContext *)avctx->priv_data;
+    VqaContext *s = avctx->priv_data;
 
     av_free(s->codebook);
     av_free(s->next_codebook_buffer);
diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index 89b8418c55..a37fdd869a 100644
--- a/libavcodec/zmbv.c
+++ b/libavcodec/zmbv.c
@@ -399,7 +399,7 @@ static int zmbv_decode_intra(ZmbvContext *c)
 
 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size)
 {
-    ZmbvContext * const c = (ZmbvContext *)avctx->priv_data;
+    ZmbvContext * const c = avctx->priv_data;
     uint8_t *outptr;
 #ifdef CONFIG_ZLIB
     int zret = Z_OK; // Zlib return code
@@ -608,7 +608,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8
  */
 static int decode_init(AVCodecContext *avctx)
 {
-    ZmbvContext * const c = (ZmbvContext *)avctx->priv_data;
+    ZmbvContext * const c = avctx->priv_data;
     int zret; // Zlib return code
 
     c->avctx = avctx;
@@ -663,7 +663,7 @@ static int decode_init(AVCodecContext *avctx)
  */
 static int decode_end(AVCodecContext *avctx)
 {
-    ZmbvContext * const c = (ZmbvContext *)avctx->priv_data;
+    ZmbvContext * const c = avctx->priv_data;
 
     av_freep(&c->decomp_buf);
 
diff --git a/libavcodec/zmbvenc.c b/libavcodec/zmbvenc.c
index a799644492..04e86235ac 100644
--- a/libavcodec/zmbvenc.c
+++ b/libavcodec/zmbvenc.c
@@ -106,7 +106,7 @@ static int zmbv_me(ZmbvEncContext *c, uint8_t *src, int sstride, uint8_t *prev,
 
 static int encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf_size, void *data)
 {
-    ZmbvEncContext * const c = (ZmbvEncContext *)avctx->priv_data;
+    ZmbvEncContext * const c = avctx->priv_data;
     AVFrame *pict = data;
     AVFrame * const p = &c->pic;
     uint8_t *src, *prev;
@@ -239,7 +239,7 @@ static int encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf_size, void
  */
 static int encode_init(AVCodecContext *avctx)
 {
-    ZmbvEncContext * const c = (ZmbvEncContext *)avctx->priv_data;
+    ZmbvEncContext * const c = avctx->priv_data;
     int zret; // Zlib return code
     int lvl = 9;
 
@@ -305,7 +305,7 @@ static int encode_init(AVCodecContext *avctx)
  */
 static int encode_end(AVCodecContext *avctx)
 {
-    ZmbvEncContext * const c = (ZmbvEncContext *)avctx->priv_data;
+    ZmbvEncContext * const c = avctx->priv_data;
 
     av_freep(&c->comp_buf);
     av_freep(&c->work_buf);
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;
 }