[SCM] libav/experimental: These video decoders do not need to include and initialize the DSP support functions.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:16:48 UTC 2013
The following commit has been merged in the experimental branch:
commit 32c3047cac9294bb56d23c89a40a22409db5cc70
Author: Mike Melanson <mike at multimedia.cx>
Date: Mon Mar 10 03:07:44 2008 +0000
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
diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
index 66ecd3f..9a30d8e 100644
--- a/libavcodec/cinepak.c
+++ b/libavcodec/cinepak.c
@@ -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;
diff --git a/libavcodec/idcinvideo.c b/libavcodec/idcinvideo.c
index 79ed6fb..a65648d 100644
--- a/libavcodec/idcinvideo.c
+++ b/libavcodec/idcinvideo.c
@@ -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) {
diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c
index baac48a..3377ce8 100644
--- a/libavcodec/msvideo1.c
+++ b/libavcodec/msvideo1.c
@@ -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;
diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c
index 84482ba..a095203 100644
--- a/libavcodec/qtrle.c
+++ b/libavcodec/qtrle.c
@@ -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;
diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c
index a4e32c3..3391ec4 100644
--- a/libavcodec/roqvideodec.c
+++ b/libavcodec/roqvideodec.c
@@ -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;
}
diff --git a/libavcodec/rpza.c b/libavcodec/rpza.c
index ea36393..3a71c69 100644
--- a/libavcodec/rpza.c
+++ b/libavcodec/rpza.c
@@ -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;
diff --git a/libavcodec/smc.c b/libavcodec/smc.c
index f181e0c..364c596 100644
--- a/libavcodec/smc.c
+++ b/libavcodec/smc.c
@@ -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;
diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
index d39ae91..4c63262 100644
--- a/libavcodec/vmdav.c
+++ b/libavcodec/vmdav.c
@@ -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) {
diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c
index 8e70143..d2beb15 100644
--- a/libavcodec/vqavideo.c
+++ b/libavcodec/vqavideo.c
@@ -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) {
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list