[006/132] ffv1: Drop bogus dependency on dsputil

Message ID 1394544261-545221-7-git-send-email-diego@biurrun.de
State Committed
Commit cd832f032f945a57a1f1dd385942c2fadc7ce4e5
Headers show

Commit Message

Diego Biurrun March 11, 2014, 1:22 p.m.
ffv1 does not use any part of the dsputil framework.
---
 configure         | 4 ++--
 libavcodec/ffv1.c | 2 --
 libavcodec/ffv1.h | 3 ---
 3 files changed, 2 insertions(+), 7 deletions(-)

Comments

Derek Buitenhuis March 11, 2014, 1:28 p.m. | #1
On 3/11/2014 1:22 PM, Diego Biurrun wrote:
> ffv1 does not use any part of the dsputil framework.
> ---
>  configure         | 4 ++--
>  libavcodec/ffv1.c | 2 --
>  libavcodec/ffv1.h | 3 ---
>  3 files changed, 2 insertions(+), 7 deletions(-)

OK.

- Derek

Patch

diff --git a/configure b/configure
index d48e53e..38bce0a 100755
--- a/configure
+++ b/configure
@@ -1683,8 +1683,8 @@  eac3_encoder_select="ac3_encoder"
 eamad_decoder_select="aandcttables dsputil mpegvideo"
 eatgq_decoder_select="aandcttables dsputil"
 eatqi_decoder_select="aandcttables error_resilience mpegvideo"
-ffv1_decoder_select="dsputil golomb rangecoder"
-ffv1_encoder_select="dsputil rangecoder"
+ffv1_decoder_select="golomb rangecoder"
+ffv1_encoder_select="rangecoder"
 ffvhuff_decoder_select="huffyuv_decoder"
 ffvhuff_encoder_select="huffyuv_encoder"
 fic_decoder_select="dsputil golomb"
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 9e7ba2e..d1a6a83 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -141,8 +141,6 @@  av_cold int ffv1_common_init(AVCodecContext *avctx)
     if (!avctx->width || !avctx->height)
         return AVERROR_INVALIDDATA;
 
-    ff_dsputil_init(&s->dsp, avctx);
-
     s->width  = avctx->width;
     s->height = avctx->height;
 
diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h
index 40fc393..5c3bdc1 100644
--- a/libavcodec/ffv1.h
+++ b/libavcodec/ffv1.h
@@ -26,7 +26,6 @@ 
 #include <stdint.h>
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "get_bits.h"
 #include "put_bits.h"
 #include "rangecoder.h"
@@ -106,8 +105,6 @@  typedef struct FFV1Context {
     int gob_count;
     int quant_table_count;
 
-    DSPContext dsp;
-
     struct FFV1Context *slice_context[MAX_SLICES];
     int slice_count;
     int num_v_slices;