summaryrefslogtreecommitdiff
path: root/libavcodec/error_resilience.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2014-02-08 02:59:58 +0100
committerDiego Biurrun <diego@biurrun.de>2014-07-17 09:07:10 -0700
commit2d60444331fca1910510038dd3817bea885c2367 (patch)
tree51ac937c7e051b03c7cc8e39b079a37f18dd09b0 /libavcodec/error_resilience.c
parenta578b0407dc983aecd72028e1127062689b67089 (diff)
downloadffmpeg-2d60444331fca1910510038dd3817bea885c2367.tar.gz
dsputil: Split motion estimation compare bits off into their own context
Diffstat (limited to 'libavcodec/error_resilience.c')
-rw-r--r--libavcodec/error_resilience.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index 6ab5a980da..b41474ad48 100644
--- a/libavcodec/error_resilience.c
+++ b/libavcodec/error_resilience.c
@@ -715,11 +715,11 @@ FF_ENABLE_DEPRECATION_WARNINGS
} else {
ff_thread_await_progress(s->last_pic.tf, mb_y, 0);
}
- is_intra_likely += s->dsp->sad[0](NULL, last_mb_ptr, mb_ptr,
- linesize[0], 16);
- is_intra_likely -= s->dsp->sad[0](NULL, last_mb_ptr,
- last_mb_ptr + linesize[0] * 16,
- linesize[0], 16);
+ is_intra_likely += s->mecc->sad[0](NULL, last_mb_ptr, mb_ptr,
+ linesize[0], 16);
+ is_intra_likely -= s->mecc->sad[0](NULL, last_mb_ptr,
+ last_mb_ptr + linesize[0] * 16,
+ linesize[0], 16);
} else {
if (IS_INTRA(s->cur_pic.mb_type[mb_xy]))
is_intra_likely++;