Commit cd832f03 authored by Diego Biurrun's avatar Diego Biurrun

ffv1: Drop bogus dependency on dsputil

ffv1 does not use any part of the dsputil framework.
parent 0e29c5e1
...@@ -1689,8 +1689,8 @@ eac3_encoder_select="ac3_encoder" ...@@ -1689,8 +1689,8 @@ eac3_encoder_select="ac3_encoder"
eamad_decoder_select="aandcttables dsputil mpegvideo" eamad_decoder_select="aandcttables dsputil mpegvideo"
eatgq_decoder_select="aandcttables dsputil" eatgq_decoder_select="aandcttables dsputil"
eatqi_decoder_select="aandcttables error_resilience mpegvideo" eatqi_decoder_select="aandcttables error_resilience mpegvideo"
ffv1_decoder_select="dsputil golomb rangecoder" ffv1_decoder_select="golomb rangecoder"
ffv1_encoder_select="dsputil rangecoder" ffv1_encoder_select="rangecoder"
ffvhuff_decoder_select="huffyuv_decoder" ffvhuff_decoder_select="huffyuv_decoder"
ffvhuff_encoder_select="huffyuv_encoder" ffvhuff_encoder_select="huffyuv_encoder"
fic_decoder_select="dsputil golomb" fic_decoder_select="dsputil golomb"
......
...@@ -141,8 +141,6 @@ av_cold int ffv1_common_init(AVCodecContext *avctx) ...@@ -141,8 +141,6 @@ av_cold int ffv1_common_init(AVCodecContext *avctx)
if (!avctx->width || !avctx->height) if (!avctx->width || !avctx->height)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
ff_dsputil_init(&s->dsp, avctx);
s->width = avctx->width; s->width = avctx->width;
s->height = avctx->height; s->height = avctx->height;
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include <stdint.h> #include <stdint.h>
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h"
#include "get_bits.h" #include "get_bits.h"
#include "put_bits.h" #include "put_bits.h"
#include "rangecoder.h" #include "rangecoder.h"
...@@ -106,8 +105,6 @@ typedef struct FFV1Context { ...@@ -106,8 +105,6 @@ typedef struct FFV1Context {
int gob_count; int gob_count;
int quant_table_count; int quant_table_count;
DSPContext dsp;
struct FFV1Context *slice_context[MAX_SLICES]; struct FFV1Context *slice_context[MAX_SLICES];
int slice_count; int slice_count;
int num_v_slices; int num_v_slices;
......
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