# HG changeset patch # User melanson # Date 1205118464 0 # Node ID 814c8bd77d91f0bfb10bfb3b6154e8f4c591de5a # Parent 1c99abd63afb62c147c91a014032c796e99a51da These video decoders do not need to include and initialize the DSP support functions. diff -r 1c99abd63afb -r 814c8bd77d91 cinepak.c --- a/cinepak.c Mon Mar 10 03:07:15 2008 +0000 +++ b/cinepak.c Mon Mar 10 03:07:44 2008 +0000 @@ -35,7 +35,6 @@ #include #include "avcodec.h" -#include "dsputil.h" typedef struct { @@ -56,7 +55,6 @@ typedef struct CinepakContext { AVCodecContext *avctx; - DSPContext dsp; AVFrame frame; const unsigned char *data; @@ -405,8 +403,6 @@ avctx->pix_fmt = PIX_FMT_PAL8; } - dsputil_init(&s->dsp, avctx); - s->frame.data[0] = NULL; return 0; diff -r 1c99abd63afb -r 814c8bd77d91 idcinvideo.c --- a/idcinvideo.c Mon Mar 10 03:07:15 2008 +0000 +++ b/idcinvideo.c Mon Mar 10 03:07:44 2008 +0000 @@ -50,7 +50,6 @@ #include #include "avcodec.h" -#include "dsputil.h" #define HUFFMAN_TABLE_SIZE 64 * 1024 #define HUF_TOKENS 256 @@ -66,7 +65,6 @@ typedef struct IdcinContext { AVCodecContext *avctx; - DSPContext dsp; AVFrame frame; const unsigned char *buf; @@ -153,7 +151,6 @@ s->avctx = avctx; avctx->pix_fmt = PIX_FMT_PAL8; - dsputil_init(&s->dsp, avctx); /* make sure the Huffman tables make it */ if (s->avctx->extradata_size != HUFFMAN_TABLE_SIZE) { diff -r 1c99abd63afb -r 814c8bd77d91 msvideo1.c --- a/msvideo1.c Mon Mar 10 03:07:15 2008 +0000 +++ b/msvideo1.c Mon Mar 10 03:07:44 2008 +0000 @@ -36,7 +36,6 @@ #include #include "avcodec.h" -#include "dsputil.h" #define PALETTE_COUNT 256 #define CHECK_STREAM_PTR(n) \ @@ -49,7 +48,6 @@ typedef struct Msvideo1Context { AVCodecContext *avctx; - DSPContext dsp; AVFrame frame; const unsigned char *buf; @@ -74,8 +72,6 @@ avctx->pix_fmt = PIX_FMT_RGB555; } - dsputil_init(&s->dsp, avctx); - s->frame.data[0] = NULL; return 0; diff -r 1c99abd63afb -r 814c8bd77d91 qtrle.c --- a/qtrle.c Mon Mar 10 03:07:15 2008 +0000 +++ b/qtrle.c Mon Mar 10 03:07:44 2008 +0000 @@ -37,12 +37,10 @@ #include #include "avcodec.h" -#include "dsputil.h" typedef struct QtrleContext { AVCodecContext *avctx; - DSPContext dsp; AVFrame frame; const unsigned char *buf; @@ -521,7 +519,6 @@ avctx->bits_per_sample); break; } - dsputil_init(&s->dsp, avctx); s->frame.data[0] = NULL; diff -r 1c99abd63afb -r 814c8bd77d91 roqvideodec.c --- a/roqvideodec.c Mon Mar 10 03:07:15 2008 +0000 +++ b/roqvideodec.c Mon Mar 10 03:07:44 2008 +0000 @@ -32,7 +32,6 @@ #include "avcodec.h" #include "bytestream.h" -#include "dsputil.h" #include "roqvideo.h" static void roqvideo_decode_frame(RoqContext *ri) @@ -164,7 +163,6 @@ s->last_frame = &s->frames[0]; s->current_frame = &s->frames[1]; avctx->pix_fmt = PIX_FMT_YUV444P; - dsputil_init(&s->dsp, avctx); return 0; } diff -r 1c99abd63afb -r 814c8bd77d91 rpza.c --- a/rpza.c Mon Mar 10 03:07:15 2008 +0000 +++ b/rpza.c Mon Mar 10 03:07:44 2008 +0000 @@ -40,12 +40,10 @@ #include #include "avcodec.h" -#include "dsputil.h" typedef struct RpzaContext { AVCodecContext *avctx; - DSPContext dsp; AVFrame frame; const unsigned char *buf; @@ -234,7 +232,6 @@ s->avctx = avctx; avctx->pix_fmt = PIX_FMT_RGB555; - dsputil_init(&s->dsp, avctx); s->frame.data[0] = NULL; diff -r 1c99abd63afb -r 814c8bd77d91 smc.c --- a/smc.c Mon Mar 10 03:07:15 2008 +0000 +++ b/smc.c Mon Mar 10 03:07:44 2008 +0000 @@ -34,7 +34,6 @@ #include #include "avcodec.h" -#include "dsputil.h" #define CPAIR 2 #define CQUAD 4 @@ -45,7 +44,6 @@ typedef struct SmcContext { AVCodecContext *avctx; - DSPContext dsp; AVFrame frame; const unsigned char *buf; @@ -434,7 +432,6 @@ s->avctx = avctx; avctx->pix_fmt = PIX_FMT_PAL8; - dsputil_init(&s->dsp, avctx); s->frame.data[0] = NULL; diff -r 1c99abd63afb -r 814c8bd77d91 vmdav.c --- a/vmdav.c Mon Mar 10 03:07:15 2008 +0000 +++ b/vmdav.c Mon Mar 10 03:07:44 2008 +0000 @@ -45,7 +45,6 @@ #include #include "avcodec.h" -#include "dsputil.h" #define VMD_HEADER_SIZE 0x330 #define PALETTE_COUNT 256 @@ -57,7 +56,6 @@ typedef struct VmdVideoContext { AVCodecContext *avctx; - DSPContext dsp; AVFrame frame; AVFrame prev_frame; @@ -336,7 +334,6 @@ s->avctx = avctx; avctx->pix_fmt = PIX_FMT_PAL8; - dsputil_init(&s->dsp, avctx); /* make sure the VMD header made it */ if (s->avctx->extradata_size != VMD_HEADER_SIZE) { diff -r 1c99abd63afb -r 814c8bd77d91 vqavideo.c --- a/vqavideo.c Mon Mar 10 03:07:15 2008 +0000 +++ b/vqavideo.c Mon Mar 10 03:07:44 2008 +0000 @@ -69,7 +69,6 @@ #include #include "avcodec.h" -#include "dsputil.h" #define PALETTE_COUNT 256 #define VQA_HEADER_SIZE 0x2A @@ -101,7 +100,6 @@ typedef struct VqaContext { AVCodecContext *avctx; - DSPContext dsp; AVFrame frame; const unsigned char *buf; @@ -137,7 +135,6 @@ s->avctx = avctx; avctx->pix_fmt = PIX_FMT_PAL8; - dsputil_init(&s->dsp, avctx); /* make sure the extradata made it */ if (s->avctx->extradata_size != VQA_HEADER_SIZE) {