aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264.h
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.h
parenta578b0407dc983aecd72028e1127062689b67089 (diff)
downloadffmpeg-2d60444331fca1910510038dd3817bea885c2367.tar.gz
dsputil: Split motion estimation compare bits off into their own context
Diffstat (limited to 'libavcodec/h264.h')
-rw-r--r--libavcodec/h264.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 39023dab63..cd4bf87690 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -30,13 +30,13 @@
#include "libavutil/intreadwrite.h"
#include "cabac.h"
-#include "dsputil.h"
#include "error_resilience.h"
#include "get_bits.h"
#include "h264chroma.h"
#include "h264dsp.h"
#include "h264pred.h"
#include "h264qpel.h"
+#include "me_cmp.h"
#include "mpegutils.h"
#include "parser.h"
#include "qpeldsp.h"
@@ -302,7 +302,7 @@ typedef struct H264Picture {
*/
typedef struct H264Context {
AVCodecContext *avctx;
- DSPContext dsp;
+ MECmpContext mecc;
VideoDSPContext vdsp;
H264DSPContext h264dsp;
H264ChromaContext h264chroma;