diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 00:03:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 00:03:59 +0200 |
| commit | 48a691630833d6b12905475b6bf39fef285872a9 (patch) | |
| tree | aaeb0c4d73c6c0c72606aae3c4a1de62b17dc6e7 /libavcodec/utvideo.h | |
| parent | e2abc0d5cacc22aa900de8ac26160ea1b786a7b5 (diff) | |
| parent | 512f3ffe9b4bb86767c2b1176554407c75fe1a5c (diff) | |
Merge commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c'
* commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c':
dsputil: Split off HuffYUV encoding bits into their own context
Conflicts:
configure
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/huffyuv.h
libavcodec/huffyuvenc.c
libavcodec/pngenc.c
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utvideo.h')
| -rw-r--r-- | libavcodec/utvideo.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/utvideo.h b/libavcodec/utvideo.h index c00179ed98..e6217da450 100644 --- a/libavcodec/utvideo.h +++ b/libavcodec/utvideo.h @@ -30,6 +30,7 @@ #include "libavutil/common.h" #include "avcodec.h" #include "dsputil.h" +#include "huffyuvencdsp.h" enum { PRED_NONE = 0, @@ -66,6 +67,7 @@ extern const int ff_ut_rgb_order[4]; typedef struct UtvideoContext { AVCodecContext *avctx; DSPContext dsp; + HuffYUVEncDSPContext hdsp; uint32_t frame_info_size, flags, frame_info; int planes; |