diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 23:16:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 23:16:36 +0100 |
| commit | fa7c08d5e192aea77fdfb7f52c44c196a3ba4452 (patch) | |
| tree | 7089b439143302515c4f0339b617b0e88004a6cd /libavcodec/h264_mb.c | |
| parent | a6cb0534e2b5e91c119c77165bc65a6ff14e649b (diff) | |
| parent | c28ed1d743443e783537d279ae721be3bbdf7646 (diff) | |
| download | ffmpeg-fa7c08d5e192aea77fdfb7f52c44c196a3ba4452.tar.gz | |
Merge commit 'c28ed1d743443e783537d279ae721be3bbdf7646'
* commit 'c28ed1d743443e783537d279ae721be3bbdf7646':
h264: move [uv]linesize to the per-slice context
Conflicts:
libavcodec/h264_mb.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mb.c')
| -rw-r--r-- | libavcodec/h264_mb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c index b1764a099f..9036919a07 100644 --- a/libavcodec/h264_mb.c +++ b/libavcodec/h264_mb.c @@ -493,12 +493,12 @@ static av_always_inline void prefetch_motion(const H264Context *h, H264SliceCont int off = mx * (1<< pixel_shift) + (my + (sl->mb_x & 3) * 4) * sl->mb_linesize + (64 << pixel_shift); - h->vdsp.prefetch(src[0] + off, h->linesize, 4); + h->vdsp.prefetch(src[0] + off, sl->linesize, 4); if (chroma_idc == 3 /* yuv444 */) { - h->vdsp.prefetch(src[1] + off, h->linesize, 4); - h->vdsp.prefetch(src[2] + off, h->linesize, 4); + h->vdsp.prefetch(src[1] + off, sl->linesize, 4); + h->vdsp.prefetch(src[2] + off, sl->linesize, 4); } else { - off= ((mx>>1)+64) * (1<<pixel_shift) + ((my>>1) + (sl->mb_x&7))*h->uvlinesize; + off= ((mx>>1)+64) * (1<<pixel_shift) + ((my>>1) + (sl->mb_x&7))*sl->uvlinesize; h->vdsp.prefetch(src[1] + off, src[2] - src[1], 2); } } |