aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mpegvideo.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-30 02:17:55 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-30 02:43:34 +0200
commit98a6806fddc2a0e8f402c9ebd7497f4a8d20f536 (patch)
treeb3d874332c592e18430fa091d670130bee02228b /libavcodec/mpegvideo.h
parentd35899ccce39e77a3f7fb667bdfc710c605d03a4 (diff)
parent368f50359eb328b0b9d67451f56fda20b3255f9a (diff)
downloadffmpeg-98a6806fddc2a0e8f402c9ebd7497f4a8d20f536.tar.gz
Merge commit '368f50359eb328b0b9d67451f56fda20b3255f9a'
* commit '368f50359eb328b0b9d67451f56fda20b3255f9a': dsputil: Split off quarterpel bits into their own context Conflicts: configure libavcodec/dsputil.c libavcodec/h263dec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/vc1dec.c libavcodec/vc1dsp.c libavcodec/x86/dsputil_init.c libavcodec/x86/qpeldsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
-rw-r--r--libavcodec/mpegvideo.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index cf35dddc0c..7b0fcafc5c 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -39,6 +39,7 @@
#include "ratecontrol.h"
#include "parser.h"
#include "mpeg12data.h"
+#include "qpeldsp.h"
#include "rl.h"
#include "thread.h"
#include "videodsp.h"
@@ -356,6 +357,7 @@ typedef struct MpegEncContext {
DSPContext dsp; ///< pointers for accelerated dsp functions
H264ChromaContext h264chroma;
HpelDSPContext hdsp;
+ QpelDSPContext qdsp;
VideoDSPContext vdsp;
H263DSPContext h263dsp;
int f_code; ///< forward MV resolution