diff options
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | libavcodec/ffv1.c | 2 | ||||
| -rw-r--r-- | libavcodec/ffv1.h | 3 |
3 files changed, 2 insertions, 7 deletions
@@ -1947,8 +1947,8 @@ eamad_decoder_select="aandcttables dsputil mpegvideo" eatgq_decoder_select="aandcttables" eatqi_decoder_select="aandcttables error_resilience mpegvideo" exr_decoder_select="zlib" -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 f8556b01f1..fbaf5ae3f8 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -54,8 +54,6 @@ av_cold int ffv1_common_init(AVCodecContext *avctx) if (!s->picture.f || !s->last_picture.f) return AVERROR(ENOMEM); - 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 ba98845e0b..5081397f54 100644 --- a/libavcodec/ffv1.h +++ b/libavcodec/ffv1.h @@ -35,7 +35,6 @@ #include "libavutil/pixdesc.h" #include "libavutil/timer.h" #include "avcodec.h" -#include "dsputil.h" #include "get_bits.h" #include "internal.h" #include "mathops.h" @@ -116,8 +115,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; |