diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-19 06:41:48 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-19 06:54:38 +0400 |
| commit | 2b05db4f8102148d013755ac2a7e47f6d79ff7ca (patch) | |
| tree | 8135823ee5f9db622126672b644e06c243ae3c01 /libavcodec/proresdec.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/proresdec.h')
| -rw-r--r-- | libavcodec/proresdec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/proresdec.h b/libavcodec/proresdec.h index de50daef00..cb7297937d 100644 --- a/libavcodec/proresdec.h +++ b/libavcodec/proresdec.h @@ -23,6 +23,7 @@ #define AVCODEC_PRORESDEC_H #include "dsputil.h" +#include "blockdsp.h" #include "proresdsp.h" typedef struct { @@ -36,6 +37,7 @@ typedef struct { typedef struct { DSPContext dsp; + BlockDSPContext bdsp; ProresDSPContext prodsp; AVFrame *frame; int frame_type; ///< 0 = progressive, 1 = tff, 2 = bff |