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/utvideoenc.c | |
| parent | e2abc0d5cacc22aa900de8ac26160ea1b786a7b5 (diff) | |
| parent | 512f3ffe9b4bb86767c2b1176554407c75fe1a5c (diff) | |
| download | ffmpeg-48a691630833d6b12905475b6bf39fef285872a9.tar.gz | |
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/utvideoenc.c')
| -rw-r--r-- | libavcodec/utvideoenc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/utvideoenc.c b/libavcodec/utvideoenc.c index 0db85a871f..e602d6af3c 100644 --- a/libavcodec/utvideoenc.c +++ b/libavcodec/utvideoenc.c @@ -31,6 +31,7 @@ #include "bytestream.h" #include "put_bits.h" #include "dsputil.h" +#include "huffyuvencdsp.h" #include "mathops.h" #include "utvideo.h" #include "huffman.h" @@ -109,6 +110,7 @@ static av_cold int utvideo_encode_init(AVCodecContext *avctx) } ff_dsputil_init(&c->dsp, avctx); + ff_huffyuvencdsp_init(&c->hdsp); /* Check the prediction method, and error out if unsupported */ if (avctx->prediction_method < 0 || avctx->prediction_method > 4) { @@ -312,7 +314,7 @@ static void median_predict(UtvideoContext *c, uint8_t *src, uint8_t *dst, int st /* Rest of the coded part uses median prediction */ for (j = 1; j < height; j++) { - c->dsp.sub_hfyu_median_prediction(dst, src - stride, src, width, &A, &B); + c->hdsp.sub_hfyu_median_pred(dst, src - stride, src, width, &A, &B); dst += width; src += stride; } |