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_mb_template.c | |
| 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_mb_template.c')
| -rw-r--r-- | libavcodec/h264_mb_template.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/h264_mb_template.c b/libavcodec/h264_mb_template.c index 9b63fefeda..0eb1d762eb 100644 --- a/libavcodec/h264_mb_template.c +++ b/libavcodec/h264_mb_template.c @@ -175,14 +175,14 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h) } else if (is_h264) { if (chroma422) { FUNC(hl_motion_422)(h, dest_y, dest_cb, dest_cr, - h->me.qpel_put, h->h264chroma.put_h264_chroma_pixels_tab, - h->me.qpel_avg, h->h264chroma.avg_h264_chroma_pixels_tab, + h->qpel_put, h->h264chroma.put_h264_chroma_pixels_tab, + h->qpel_avg, h->h264chroma.avg_h264_chroma_pixels_tab, h->h264dsp.weight_h264_pixels_tab, h->h264dsp.biweight_h264_pixels_tab); } else { FUNC(hl_motion_420)(h, dest_y, dest_cb, dest_cr, - h->me.qpel_put, h->h264chroma.put_h264_chroma_pixels_tab, - h->me.qpel_avg, h->h264chroma.avg_h264_chroma_pixels_tab, + h->qpel_put, h->h264chroma.put_h264_chroma_pixels_tab, + h->qpel_avg, h->h264chroma.avg_h264_chroma_pixels_tab, h->h264dsp.weight_h264_pixels_tab, h->h264dsp.biweight_h264_pixels_tab); } @@ -354,8 +354,8 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h) linesize, 0, 1, SIMPLE, PIXEL_SHIFT); } else { FUNC(hl_motion_444)(h, dest[0], dest[1], dest[2], - h->me.qpel_put, h->h264chroma.put_h264_chroma_pixels_tab, - h->me.qpel_avg, h->h264chroma.avg_h264_chroma_pixels_tab, + h->qpel_put, h->h264chroma.put_h264_chroma_pixels_tab, + h->qpel_avg, h->h264chroma.avg_h264_chroma_pixels_tab, h->h264dsp.weight_h264_pixels_tab, h->h264dsp.biweight_h264_pixels_tab); } |