Commit 32c3047c authored by Mike Melanson's avatar Mike Melanson

These video decoders do not need to include and initialize the DSP

support functions.

Originally committed as revision 12406 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent d61af67a
......@@ -35,7 +35,6 @@
#include <unistd.h>
#include "avcodec.h"
#include "dsputil.h"
typedef struct {
......@@ -56,7 +55,6 @@ typedef struct {
typedef struct CinepakContext {
AVCodecContext *avctx;
DSPContext dsp;
AVFrame frame;
const unsigned char *data;
......@@ -405,8 +403,6 @@ static int cinepak_decode_init(AVCodecContext *avctx)
avctx->pix_fmt = PIX_FMT_PAL8;
}
dsputil_init(&s->dsp, avctx);
s->frame.data[0] = NULL;
return 0;
......
......@@ -50,7 +50,6 @@
#include <unistd.h>
#include "avcodec.h"
#include "dsputil.h"
#define HUFFMAN_TABLE_SIZE 64 * 1024
#define HUF_TOKENS 256
......@@ -66,7 +65,6 @@ typedef struct
typedef struct IdcinContext {
AVCodecContext *avctx;
DSPContext dsp;
AVFrame frame;
const unsigned char *buf;
......@@ -153,7 +151,6 @@ static int idcin_decode_init(AVCodecContext *avctx)
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) {
......
......@@ -36,7 +36,6 @@
#include <unistd.h>
#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 @@ static int msvideo1_decode_init(AVCodecContext *avctx)
avctx->pix_fmt = PIX_FMT_RGB555;
}
dsputil_init(&s->dsp, avctx);
s->frame.data[0] = NULL;
return 0;
......
......@@ -37,12 +37,10 @@
#include <unistd.h>
#include "avcodec.h"
#include "dsputil.h"
typedef struct QtrleContext {
AVCodecContext *avctx;
DSPContext dsp;
AVFrame frame;
const unsigned char *buf;
......@@ -521,7 +519,6 @@ static int qtrle_decode_init(AVCodecContext *avctx)
avctx->bits_per_sample);
break;
}
dsputil_init(&s->dsp, avctx);
s->frame.data[0] = NULL;
......
......@@ -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 @@ static int roq_decode_init(AVCodecContext *avctx)
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;
}
......
......@@ -40,12 +40,10 @@
#include <unistd.h>
#include "avcodec.h"
#include "dsputil.h"
typedef struct RpzaContext {
AVCodecContext *avctx;
DSPContext dsp;
AVFrame frame;
const unsigned char *buf;
......@@ -234,7 +232,6 @@ static int rpza_decode_init(AVCodecContext *avctx)
s->avctx = avctx;
avctx->pix_fmt = PIX_FMT_RGB555;
dsputil_init(&s->dsp, avctx);
s->frame.data[0] = NULL;
......
......@@ -34,7 +34,6 @@
#include <unistd.h>
#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 @@ static int smc_decode_init(AVCodecContext *avctx)
s->avctx = avctx;
avctx->pix_fmt = PIX_FMT_PAL8;
dsputil_init(&s->dsp, avctx);
s->frame.data[0] = NULL;
......
......@@ -45,7 +45,6 @@
#include <unistd.h>
#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 @@ static int vmdvideo_decode_init(AVCodecContext *avctx)
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) {
......
......@@ -69,7 +69,6 @@
#include <unistd.h>
#include "avcodec.h"
#include "dsputil.h"
#define PALETTE_COUNT 256
#define VQA_HEADER_SIZE 0x2A
......@@ -101,7 +100,6 @@ static inline void vqa_debug(const char *format, ...) { }
typedef struct VqaContext {
AVCodecContext *avctx;
DSPContext dsp;
AVFrame frame;
const unsigned char *buf;
......@@ -137,7 +135,6 @@ static int vqa_decode_init(AVCodecContext *avctx)
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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment