diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-13 21:26:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-13 21:26:49 +0100 |
| commit | daded4f89a7762a685ae3b5119eec14fc24192a9 (patch) | |
| tree | 7bf42dc5576ed1e11229175a7c4649abe91e91bb /libavcodec | |
| parent | 981aa023387ebfaa19ea8079e423d72cd0321b0b (diff) | |
| parent | cd832f032f945a57a1f1dd385942c2fadc7ce4e5 (diff) | |
Merge commit 'cd832f032f945a57a1f1dd385942c2fadc7ce4e5'
* commit 'cd832f032f945a57a1f1dd385942c2fadc7ce4e5':
ffv1: Drop bogus dependency on dsputil
Conflicts:
configure
libavcodec/ffv1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ffv1.c | 2 | ||||
| -rw-r--r-- | libavcodec/ffv1.h | 3 |
2 files changed, 0 insertions, 5 deletions
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; |