diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-02-27 18:43:28 +0100 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-03-16 23:01:01 +0100 |
| commit | 136034d86b5cb1819a2c3e6ecdfeb05dcba7140d (patch) | |
| tree | 5fff3e6c9e5ec69f032d22b6bac9aee4c845211f /libavcodec/h264.h | |
| parent | e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c (diff) | |
| download | ffmpeg-136034d86b5cb1819a2c3e6ecdfeb05dcba7140d.tar.gz | |
h264: Remove MotionEstContext and move the relevant fields to H264Context
Unused buffers scratchpad and temp have been dropped too.
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 b4421069ac..a912db728c 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" @@ -302,7 +303,6 @@ typedef struct H264Context { H264DSPContext h264dsp; H264ChromaContext h264chroma; H264QpelContext h264qpel; - MotionEstContext me; ParseContext parse_context; GetBitContext gb; ERContext er; @@ -693,6 +693,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[3][QP_MAX_NUM + 1]; ///< One chroma qp table for each supported bit depth (8, 9, 10). |