diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-02-08 02:59:58 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-07-17 09:07:10 -0700 |
| commit | 2d60444331fca1910510038dd3817bea885c2367 (patch) | |
| tree | 51ac937c7e051b03c7cc8e39b079a37f18dd09b0 /libavcodec/h264.c | |
| parent | a578b0407dc983aecd72028e1127062689b67089 (diff) | |
| download | ffmpeg-2d60444331fca1910510038dd3817bea885c2367.tar.gz | |
dsputil: Split motion estimation compare bits off into their own context
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index dcd2ad831e..ba30e5d38e 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -33,7 +33,6 @@ #include "internal.h" #include "cabac.h" #include "cabac_functions.h" -#include "dsputil.h" #include "error_resilience.h" #include "avcodec.h" #include "h264.h" @@ -42,6 +41,7 @@ #include "h264_mvpred.h" #include "golomb.h" #include "mathops.h" +#include "me_cmp.h" #include "mpegutils.h" #include "rectangle.h" #include "svq3.h" @@ -490,7 +490,7 @@ int ff_h264_context_init(H264Context *h) if (CONFIG_ERROR_RESILIENCE) { /* init ER */ er->avctx = h->avctx; - er->dsp = &h->dsp; + er->mecc = &h->mecc; er->decode_mb = h264_er_decode_mb; er->opaque = h; er->quarter_sample = 1; @@ -620,7 +620,7 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx) /* needed so that IDCT permutation is known early */ if (CONFIG_ERROR_RESILIENCE) - ff_dsputil_init(&h->dsp, h->avctx); + ff_me_cmp_init(&h->mecc, h->avctx); ff_videodsp_init(&h->vdsp, 8); memset(h->pps.scaling_matrix4, 16, 6 * 16 * sizeof(uint8_t)); @@ -1234,7 +1234,7 @@ int ff_h264_set_parameter_from_sps(H264Context *h) ff_h264_pred_init(&h->hpc, h->avctx->codec_id, h->sps.bit_depth_luma, h->sps.chroma_format_idc); if (CONFIG_ERROR_RESILIENCE) - ff_dsputil_init(&h->dsp, h->avctx); + ff_me_cmp_init(&h->mecc, h->avctx); ff_videodsp_init(&h->vdsp, h->sps.bit_depth_luma); } else { av_log(h->avctx, AV_LOG_ERROR, "Unsupported bit depth %d\n", |