diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-10 00:56:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-10 01:22:14 +0200 |
| commit | 2d5e9451de3c7ab00cac6ec4aff290e12a2f190d (patch) | |
| tree | 9934a09e3ad1f63796274ee59f216df19cd9ca02 /libavcodec/asv.h | |
| parent | 6cc1fec41263add956b35af96d7c4a81c9436a65 (diff) | |
| parent | f46bb608d9d76c543e4929dc8cffe36b84bd789e (diff) | |
Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'
* commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e':
dsputil: Split off pixel block routines into their own context
Conflicts:
configure
libavcodec/dsputil.c
libavcodec/mpegvideo_enc.c
libavcodec/pixblockdsp_template.c
libavcodec/x86/dsputilenc.asm
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/asv.h')
| -rw-r--r-- | libavcodec/asv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/asv.h b/libavcodec/asv.h index e1f90e51ec..a0e8fef703 100644 --- a/libavcodec/asv.h +++ b/libavcodec/asv.h @@ -33,19 +33,19 @@ #include "avcodec.h" #include "blockdsp.h" #include "bswapdsp.h" -#include "dsputil.h" #include "fdctdsp.h" #include "idctdsp.h" #include "get_bits.h" +#include "pixblockdsp.h" #include "put_bits.h" typedef struct ASV1Context{ AVCodecContext *avctx; BlockDSPContext bdsp; BswapDSPContext bbdsp; - DSPContext dsp; FDCTDSPContext fdsp; IDCTDSPContext idsp; + PixblockDSPContext pdsp; PutBitContext pb; GetBitContext gb; ScanTable scantable; |