[SCM] libav/experimental: ffv1: Drop bogus dependency on dsputil

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit cd832f032f945a57a1f1dd385942c2fadc7ce4e5
Author: Diego Biurrun <diego at biurrun.de>
Date:   Mon Feb 24 06:01:16 2014 -0800

    ffv1: Drop bogus dependency on dsputil
    
    ffv1 does not use any part of the dsputil framework.

diff --git a/configure b/configure
index d3b0928..3a0cae6 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 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;

-- 
Libav/FFmpeg packaging