diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-08 03:12:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-08 03:19:06 +0200 |
| commit | 14e2406de7d211d50fcce0059c90103bdaa947aa (patch) | |
| tree | 10e20cd60b4f4bc91d14957b9565871cdd0381c3 /libavcodec/asv.h | |
| parent | 5c7bf354dc0c8bea6e7af21c0bc2edad92974274 (diff) | |
| parent | a9aee08d900f686e966c64afec5d88a7d9d130a3 (diff) | |
| download | ffmpeg-14e2406de7d211d50fcce0059c90103bdaa947aa.tar.gz | |
Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3'
* commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3':
dsputil: Split off FDCT bits into their own context
Conflicts:
configure
libavcodec/Makefile
libavcodec/asvenc.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/x86/Makefile
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/asv.h')
| -rw-r--r-- | libavcodec/asv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/asv.h b/libavcodec/asv.h index 6f89dcc27c..e1f90e51ec 100644 --- a/libavcodec/asv.h +++ b/libavcodec/asv.h @@ -34,6 +34,7 @@ #include "blockdsp.h" #include "bswapdsp.h" #include "dsputil.h" +#include "fdctdsp.h" #include "idctdsp.h" #include "get_bits.h" #include "put_bits.h" @@ -43,6 +44,7 @@ typedef struct ASV1Context{ BlockDSPContext bdsp; BswapDSPContext bbdsp; DSPContext dsp; + FDCTDSPContext fdsp; IDCTDSPContext idsp; PutBitContext pb; GetBitContext gb; |