summaryrefslogtreecommitdiff
path: root/libavcodec/h264_slice.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/h264_slice.c
parenta578b0407dc983aecd72028e1127062689b67089 (diff)
dsputil: Split motion estimation compare bits off into their own context
Diffstat (limited to 'libavcodec/h264_slice.c')
-rw-r--r--libavcodec/h264_slice.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 1b9f56b488..ce62fbf68e 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -31,7 +31,6 @@
#include "internal.h"
#include "cabac.h"
#include "cabac_functions.h"
-#include "dsputil.h"
#include "error_resilience.h"
#include "avcodec.h"
#include "h264.h"
@@ -1119,7 +1118,7 @@ static int h264_slice_header_init(H264Context *h, int reinit)
if (!c)
return AVERROR(ENOMEM);
c->avctx = h->avctx;
- c->dsp = h->dsp;
+ c->mecc = h->mecc;
c->vdsp = h->vdsp;
c->h264dsp = h->h264dsp;
c->h264qpel = h->h264qpel;