diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-19 04:41:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-19 04:54:38 +0200 |
| commit | 2b05db4f8102148d013755ac2a7e47f6d79ff7ca (patch) | |
| tree | 8135823ee5f9db622126672b644e06c243ae3c01 /libavcodec/cavs.h | |
| parent | ab12373956e92b865bced9b05b12971f062cfd3e (diff) | |
| parent | e74433a8e6fc00c8dbde293c97a3e45384c2c1d9 (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/cavs.h')
| -rw-r--r-- | libavcodec/cavs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/cavs.h b/libavcodec/cavs.h index f85140927b..5569d822d9 100644 --- a/libavcodec/cavs.h +++ b/libavcodec/cavs.h @@ -23,6 +23,7 @@ #define AVCODEC_CAVS_H #include "cavsdsp.h" +#include "blockdsp.h" #include "dsputil.h" #include "h264chroma.h" #include "get_bits.h" @@ -162,6 +163,7 @@ typedef struct AVSFrame { typedef struct AVSContext { AVCodecContext *avctx; DSPContext dsp; + BlockDSPContext bdsp; H264ChromaContext h264chroma; VideoDSPContext vdsp; CAVSDSPContext cdsp; |