# HG changeset patch # User diego # Date 1176063856 0 # Node ID b3ee9a1526b08b9d357d0169939bfd1a6b6f2a58 # Parent 9ca9a53a848b6e2ce26ab4b5b998fc905f1007ce Get rid of unnecessary pointer casts. patch by Nicholas Tung, ntung ntung com diff -r 9ca9a53a848b -r b3ee9a1526b0 8bps.c --- a/8bps.c Sun Apr 08 18:54:53 2007 +0000 +++ b/8bps.c Sun Apr 08 20:24:16 2007 +0000 @@ -61,7 +61,7 @@ */ 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_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_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 -r 9ca9a53a848b -r b3ee9a1526b0 aasc.c --- a/aasc.c Sun Apr 08 18:54:53 2007 +0000 +++ b/aasc.c Sun Apr 08 20:24:16 2007 +0000 @@ -47,7 +47,7 @@ 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 @@ 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_end(AVCodecContext *avctx) { - AascContext *s = (AascContext *)avctx->priv_data; + AascContext *s = avctx->priv_data; /* release the last frame */ if (s->frame.data[0]) diff -r 9ca9a53a848b -r b3ee9a1526b0 cinepak.c --- a/cinepak.c Sun Apr 08 18:54:53 2007 +0000 +++ b/cinepak.c Sun Apr 08 20:24:16 2007 +0000 @@ -391,7 +391,7 @@ 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 @@ 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_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 -r 9ca9a53a848b -r b3ee9a1526b0 cscd.c --- a/cscd.c Sun Apr 08 18:54:53 2007 +0000 +++ b/cscd.c Sun Apr 08 20:24:16 2007 +0000 @@ -137,7 +137,7 @@ 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_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_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 -r 9ca9a53a848b -r b3ee9a1526b0 dsicinav.c --- a/dsicinav.c Sun Apr 08 18:54:53 2007 +0000 +++ b/dsicinav.c Sun Apr 08 20:24:16 2007 +0000 @@ -88,7 +88,7 @@ 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 @@ 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_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 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 @@ 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 -r 9ca9a53a848b -r b3ee9a1526b0 dxa.c --- a/dxa.c Sun Apr 08 18:54:53 2007 +0000 +++ b/dxa.c Sun Apr 08 20:24:16 2007 +0000 @@ -191,7 +191,7 @@ 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_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_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 -r 9ca9a53a848b -r b3ee9a1526b0 faad.c --- a/faad.c Sun Apr 08 18:54:53 2007 +0000 +++ b/faad.c Sun Apr 08 20:24:16 2007 +0000 @@ -103,7 +103,7 @@ 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 @@ 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_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_init(AVCodecContext *avctx) { - FAACContext *s = (FAACContext *) avctx->priv_data; + FAACContext *s = avctx->priv_data; faacDecConfigurationPtr faac_cfg; #ifdef CONFIG_LIBFAADBIN diff -r 9ca9a53a848b -r b3ee9a1526b0 flashsv.c --- a/flashsv.c Sun Apr 08 18:54:53 2007 +0000 +++ b/flashsv.c Sun Apr 08 20:24:16 2007 +0000 @@ -82,7 +82,7 @@ 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 @@ 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_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 -r 9ca9a53a848b -r b3ee9a1526b0 flashsvenc.c --- a/flashsvenc.c Sun Apr 08 18:54:53 2007 +0000 +++ b/flashsvenc.c Sun Apr 08 20:24:16 2007 +0000 @@ -100,7 +100,7 @@ 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 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_end(AVCodecContext *avctx) { - FlashSVContext *s = (FlashSVContext *)avctx->priv_data; + FlashSVContext *s = avctx->priv_data; deflateEnd(&(s->zstream)); diff -r 9ca9a53a848b -r b3ee9a1526b0 flicvideo.c --- a/flicvideo.c Sun Apr 08 18:54:53 2007 +0000 +++ b/flicvideo.c Sun Apr 08 20:24:16 2007 +0000 @@ -80,7 +80,7 @@ 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 @@ 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 @@ { /* 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 -r 9ca9a53a848b -r b3ee9a1526b0 idcinvideo.c --- a/idcinvideo.c Sun Apr 08 18:54:53 2007 +0000 +++ b/idcinvideo.c Sun Apr 08 20:24:16 2007 +0000 @@ -149,7 +149,7 @@ 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 @@ 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_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 -r 9ca9a53a848b -r b3ee9a1526b0 kmvc.c --- a/kmvc.c Sun Apr 08 18:54:53 2007 +0000 +++ b/kmvc.c Sun Apr 08 20:24:16 2007 +0000 @@ -228,7 +228,7 @@ 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_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_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 -r 9ca9a53a848b -r b3ee9a1526b0 lcl.c --- a/lcl.c Sun Apr 08 18:54:53 2007 +0000 +++ b/lcl.c Sun Apr 08 20:24:16 2007 +0000 @@ -200,7 +200,7 @@ */ 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 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 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 -r 9ca9a53a848b -r b3ee9a1526b0 msrle.c --- a/msrle.c Sun Apr 08 18:54:53 2007 +0000 +++ b/msrle.c Sun Apr 08 20:24:16 2007 +0000 @@ -239,7 +239,7 @@ 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 @@ 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_end(AVCodecContext *avctx) { - MsrleContext *s = (MsrleContext *)avctx->priv_data; + MsrleContext *s = avctx->priv_data; /* release the last frame */ if (s->frame.data[0]) diff -r 9ca9a53a848b -r b3ee9a1526b0 msvideo1.c --- a/msvideo1.c Sun Apr 08 18:54:53 2007 +0000 +++ b/msvideo1.c Sun Apr 08 20:24:16 2007 +0000 @@ -63,7 +63,7 @@ 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 @@ 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_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 -r 9ca9a53a848b -r b3ee9a1526b0 nuv.c --- a/nuv.c Sun Apr 08 18:54:53 2007 +0000 +++ b/nuv.c Sun Apr 08 20:24:16 2007 +0000 @@ -72,7 +72,7 @@ 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_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_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 -r 9ca9a53a848b -r b3ee9a1526b0 qtrle.c --- a/qtrle.c Sun Apr 08 18:54:53 2007 +0000 +++ b/qtrle.c Sun Apr 08 20:24:16 2007 +0000 @@ -491,7 +491,7 @@ 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 @@ 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_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 -r 9ca9a53a848b -r b3ee9a1526b0 rpza.c --- a/rpza.c Sun Apr 08 18:54:53 2007 +0000 +++ b/rpza.c Sun Apr 08 20:24:16 2007 +0000 @@ -232,7 +232,7 @@ 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 @@ 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_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 -r 9ca9a53a848b -r b3ee9a1526b0 smacker.c --- a/smacker.c Sun Apr 08 18:54:53 2007 +0000 +++ b/smacker.c Sun Apr 08 20:24:16 2007 +0000 @@ -348,7 +348,7 @@ 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_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_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 -r 9ca9a53a848b -r b3ee9a1526b0 smc.c --- a/smc.c Sun Apr 08 18:54:53 2007 +0000 +++ b/smc.c Sun Apr 08 20:24:16 2007 +0000 @@ -432,7 +432,7 @@ 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 @@ 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_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 -r 9ca9a53a848b -r b3ee9a1526b0 tiertexseqv.c --- a/tiertexseqv.c Sun Apr 08 18:54:53 2007 +0000 +++ b/tiertexseqv.c Sun Apr 08 20:24:16 2007 +0000 @@ -176,7 +176,7 @@ 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 @@ 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_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 -r 9ca9a53a848b -r b3ee9a1526b0 truemotion1.c --- a/truemotion1.c Sun Apr 08 18:54:53 2007 +0000 +++ b/truemotion1.c Sun Apr 08 20:24:16 2007 +0000 @@ -465,7 +465,7 @@ 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 @@ 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_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 -r 9ca9a53a848b -r b3ee9a1526b0 tscc.c --- a/tscc.c Sun Apr 08 18:54:53 2007 +0000 +++ b/tscc.c Sun Apr 08 20:24:16 2007 +0000 @@ -186,7 +186,7 @@ */ 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_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_end(AVCodecContext *avctx) { - CamtasiaContext * const c = (CamtasiaContext *)avctx->priv_data; + CamtasiaContext * const c = avctx->priv_data; av_freep(&c->decomp_buf); diff -r 9ca9a53a848b -r b3ee9a1526b0 vmdav.c --- a/vmdav.c Sun Apr 08 18:54:53 2007 +0000 +++ b/vmdav.c Sun Apr 08 20:24:16 2007 +0000 @@ -318,7 +318,7 @@ 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 @@ 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_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 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 @@ 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 -r 9ca9a53a848b -r b3ee9a1526b0 vmnc.c --- a/vmnc.c Sun Apr 08 18:54:53 2007 +0000 +++ b/vmnc.c Sun Apr 08 20:24:16 2007 +0000 @@ -287,7 +287,7 @@ 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_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_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 -r 9ca9a53a848b -r b3ee9a1526b0 vqavideo.c --- a/vqavideo.c Sun Apr 08 18:54:53 2007 +0000 +++ b/vqavideo.c Sun Apr 08 20:24:16 2007 +0000 @@ -133,7 +133,7 @@ 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 @@ 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_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 -r 9ca9a53a848b -r b3ee9a1526b0 zmbv.c --- a/zmbv.c Sun Apr 08 18:54:53 2007 +0000 +++ b/zmbv.c Sun Apr 08 20:24:16 2007 +0000 @@ -399,7 +399,7 @@ 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_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_end(AVCodecContext *avctx) { - ZmbvContext * const c = (ZmbvContext *)avctx->priv_data; + ZmbvContext * const c = avctx->priv_data; av_freep(&c->decomp_buf); diff -r 9ca9a53a848b -r b3ee9a1526b0 zmbvenc.c --- a/zmbvenc.c Sun Apr 08 18:54:53 2007 +0000 +++ b/zmbvenc.c Sun Apr 08 20:24:16 2007 +0000 @@ -106,7 +106,7 @@ 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_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_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);