diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-17 23:27:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-17 23:27:40 +0200 |
| commit | 3a2d1465c88625774530399b06dc4d48b24bb51f (patch) | |
| tree | 4be7740e2fca1a95af5ec112526c84ca69b64092 /libavcodec/dvenc.c | |
| parent | 6be71e9955954422227f9691b4f5367a7169b099 (diff) | |
| parent | 2d60444331fca1910510038dd3817bea885c2367 (diff) | |
| download | ffmpeg-3a2d1465c88625774530399b06dc4d48b24bb51f.tar.gz | |
Merge commit '2d60444331fca1910510038dd3817bea885c2367'
* commit '2d60444331fca1910510038dd3817bea885c2367':
dsputil: Split motion estimation compare bits off into their own context
Conflicts:
configure
libavcodec/Makefile
libavcodec/arm/Makefile
libavcodec/dvenc.c
libavcodec/error_resilience.c
libavcodec/h264.h
libavcodec/h264_slice.c
libavcodec/me_cmp.c
libavcodec/me_cmp.h
libavcodec/motion_est.c
libavcodec/motion_est_template.c
libavcodec/mpeg4videoenc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/x86/Makefile
libavcodec/x86/me_cmp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dvenc.c')
| -rw-r--r-- | libavcodec/dvenc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c index aeb4a33259..4ea181c6d8 100644 --- a/libavcodec/dvenc.c +++ b/libavcodec/dvenc.c @@ -28,9 +28,9 @@ #include "libavutil/pixdesc.h" #include "config.h" #include "avcodec.h" -#include "dsputil.h" #include "fdctdsp.h" #include "internal.h" +#include "me_cmp.h" #include "pixblockdsp.h" #include "put_bits.h" #include "dv.h" @@ -40,8 +40,8 @@ static av_cold int dvvideo_encode_init(AVCodecContext *avctx) { DVVideoContext *s = avctx->priv_data; - DSPContext dsp; FDCTDSPContext fdsp; + MECmpContext mecc; PixblockDSPContext pdsp; int ret; @@ -69,14 +69,14 @@ static av_cold int dvvideo_encode_init(AVCodecContext *avctx) dv_vlc_map_tableinit(); - memset(&dsp,0, sizeof(dsp)); - ff_dsputil_init(&dsp, avctx); + memset(&mecc,0, sizeof(mecc)); ff_fdctdsp_init(&fdsp, avctx); + ff_me_cmp_init(&mecc, avctx); ff_pixblockdsp_init(&pdsp, avctx); - ff_set_cmp(&dsp, dsp.ildct_cmp, avctx->ildct_cmp); + ff_set_cmp(&mecc, mecc.ildct_cmp, avctx->ildct_cmp); s->get_pixels = pdsp.get_pixels; - s->ildct_cmp = dsp.ildct_cmp[5]; + s->ildct_cmp = mecc.ildct_cmp[5]; s->fdct[0] = fdsp.fdct; s->fdct[1] = fdsp.fdct248; |