From cd832f032f945a57a1f1dd385942c2fadc7ce4e5 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Mon, 24 Feb 2014 06:01:16 -0800
Subject: [PATCH] ffv1: Drop bogus dependency on dsputil

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(-)

diff --git a/configure b/configure
index d3b0928afe..3a0cae6042 100755
--- a/configure
+++ b/configure
@@ -1689,8 +1689,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 9e7ba2ef19..d1a6a83b13 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 40fc3935ff..5c3bdc1dbf 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;