diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-20 12:31:29 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-20 12:31:29 +0200 |
| commit | 0ab1816315b01dae882a93db90e7f6709e6a71fd (patch) | |
| tree | b92754ea02eb1f1f354a5ca63e9b6a170fe99232 /libavcodec/h264_mb_template.c | |
| parent | dcdf69561fde475f2d99573174eb5ae54e3052de (diff) | |
| parent | 56087ec0a29314d1860f6f0e6f40fbb9b40feccd (diff) | |
| download | ffmpeg-0ab1816315b01dae882a93db90e7f6709e6a71fd.tar.gz | |
Merge commit '56087ec0a29314d1860f6f0e6f40fbb9b40feccd'
* commit '56087ec0a29314d1860f6f0e6f40fbb9b40feccd':
h264: drop a pointless indirection
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'libavcodec/h264_mb_template.c')
| -rw-r--r-- | libavcodec/h264_mb_template.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/libavcodec/h264_mb_template.c b/libavcodec/h264_mb_template.c index f582b00a5e..d5ea26a6e3 100644 --- a/libavcodec/h264_mb_template.c +++ b/libavcodec/h264_mb_template.c @@ -170,14 +170,18 @@ static av_noinline void FUNC(hl_decode_mb)(const H264Context *h, H264SliceContex } else { if (chroma422) { FUNC(hl_motion_422)(h, sl, dest_y, dest_cb, dest_cr, - h->qpel_put, h->h264chroma.put_h264_chroma_pixels_tab, - h->qpel_avg, h->h264chroma.avg_h264_chroma_pixels_tab, + h->h264qpel.put_h264_qpel_pixels_tab, + h->h264chroma.put_h264_chroma_pixels_tab, + h->h264qpel.avg_h264_qpel_pixels_tab, + 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, sl, dest_y, dest_cb, dest_cr, - h->qpel_put, h->h264chroma.put_h264_chroma_pixels_tab, - h->qpel_avg, h->h264chroma.avg_h264_chroma_pixels_tab, + h->h264qpel.put_h264_qpel_pixels_tab, + h->h264chroma.put_h264_chroma_pixels_tab, + h->h264qpel.avg_h264_qpel_pixels_tab, + h->h264chroma.avg_h264_chroma_pixels_tab, h->h264dsp.weight_h264_pixels_tab, h->h264dsp.biweight_h264_pixels_tab); } @@ -333,8 +337,10 @@ static av_noinline void FUNC(hl_decode_mb_444)(const H264Context *h, H264SliceCo linesize, 0, 1, SIMPLE, PIXEL_SHIFT); } else { FUNC(hl_motion_444)(h, sl, dest[0], dest[1], dest[2], - h->qpel_put, h->h264chroma.put_h264_chroma_pixels_tab, - h->qpel_avg, h->h264chroma.avg_h264_chroma_pixels_tab, + h->h264qpel.put_h264_qpel_pixels_tab, + h->h264chroma.put_h264_chroma_pixels_tab, + h->h264qpel.avg_h264_qpel_pixels_tab, + h->h264chroma.avg_h264_chroma_pixels_tab, h->h264dsp.weight_h264_pixels_tab, h->h264dsp.biweight_h264_pixels_tab); } |