diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 12:24:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 12:26:09 +0100 |
| commit | 3e5833802ec711b2ffde3137374170a650d67abc (patch) | |
| tree | 483c8ab0338a69b61ddab4898ff9d2cb13b253af /libavcodec/h264.h | |
| parent | bb3c0571d31a2aef2556050127b7b5f99298b237 (diff) | |
| parent | 136034d86b5cb1819a2c3e6ecdfeb05dcba7140d (diff) | |
| download | ffmpeg-3e5833802ec711b2ffde3137374170a650d67abc.tar.gz | |
Merge commit '136034d86b5cb1819a2c3e6ecdfeb05dcba7140d'
* commit '136034d86b5cb1819a2c3e6ecdfeb05dcba7140d':
h264: Remove MotionEstContext and move the relevant fields to H264Context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index a18c96ded0..0b199462e9 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -30,6 +30,7 @@ #include "libavutil/intreadwrite.h" #include "cabac.h" +#include "dsputil.h" #include "error_resilience.h" #include "get_bits.h" #include "mpegvideo.h" @@ -335,7 +336,6 @@ typedef struct H264Context { H264DSPContext h264dsp; H264ChromaContext h264chroma; H264QpelContext h264qpel; - MotionEstContext me; ParseContext parse_context; GetBitContext gb; DSPContext dsp; @@ -744,6 +744,10 @@ typedef struct H264Context { AVBufferPool *mb_type_pool; AVBufferPool *motion_val_pool; AVBufferPool *ref_index_pool; + + /* Motion Estimation */ + qpel_mc_func (*qpel_put)[16]; + qpel_mc_func (*qpel_avg)[16]; } H264Context; extern const uint8_t ff_h264_chroma_qp[7][QP_MAX_NUM + 1]; ///< One chroma qp table for each possible bit depth (8-14). |