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_mb_template.c | |
| 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_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 da3a9263de..1c13825a85 100644 --- a/libavcodec/h264_mb_template.c +++ b/libavcodec/h264_mb_template.c @@ -172,14 +172,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); } @@ -351,8 +351,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); } |