Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-19 06:41:48 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-06-19 06:54:38 +0400
commit2b05db4f8102148d013755ac2a7e47f6d79ff7ca (patch)
tree8135823ee5f9db622126672b644e06c243ae3c01 /libavcodec/asv.h
parentab12373956e92b865bced9b05b12971f062cfd3e (diff)
parente74433a8e6fc00c8dbde293c97a3e45384c2c1d9 (diff)
Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'
* commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9': dsputil: Split clear_block*/fill_block* off into a separate context Conflicts: configure libavcodec/asvdec.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dsputil.h libavcodec/eamad.c libavcodec/intrax8.c libavcodec/mjpegdec.c libavcodec/ppc/dsputil_ppc.c libavcodec/vc1dec.c libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/asv.h')
-rw-r--r--libavcodec/asv.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/asv.h b/libavcodec/asv.h
index ce3c73aba4..dec56d182a 100644
--- a/libavcodec/asv.h
+++ b/libavcodec/asv.h
@@ -31,12 +31,14 @@
#include "libavutil/mem.h"
#include "avcodec.h"
+#include "blockdsp.h"
#include "dsputil.h"
#include "get_bits.h"
#include "put_bits.h"
typedef struct ASV1Context{
AVCodecContext *avctx;
+ BlockDSPContext bdsp;
DSPContext dsp;
PutBitContext pb;
GetBitContext gb;