diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-01-17 22:28:46 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 11:27:12 +0100 |
| commit | 8b00f4df20f4a8ab0656fdaf7d00233a6515a052 (patch) | |
| tree | d38eecad62cb1b7881766f1103a24804864017bd /libavcodec/svq3.c | |
| parent | 4bd5ac200d15b4f458a50f66006549825f9fc865 (diff) | |
h264: move some neighbour information into the per-slice context
Diffstat (limited to 'libavcodec/svq3.c')
| -rw-r--r-- | libavcodec/svq3.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index cad546bc61..87ddc1a580 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -369,6 +369,7 @@ static inline int svq3_mc_dir(SVQ3Context *s, int size, int mode, { int i, j, k, mx, my, dx, dy, x, y; H264Context *h = &s->h; + H264SliceContext *sl = &h->slice_ctx[0]; const int part_width = ((size & 5) == 4) ? 4 : 16 >> (size & 1); const int part_height = 16 >> ((unsigned)(size + 1) / 3); const int extra_width = (mode == PREDICT_MODE) ? -16 * 6 : 0; @@ -386,7 +387,7 @@ static inline int svq3_mc_dir(SVQ3Context *s, int size, int mode, (j >> 1 & 4) + (i & 8); if (mode != PREDICT_MODE) { - pred_motion(h, k, part_width >> 2, dir, 1, &mx, &my); + pred_motion(h, sl, k, part_width >> 2, dir, 1, &mx, &my); } else { mx = s->next_pic->motion_val[0][b_xy][0] << 1; my = s->next_pic->motion_val[0][b_xy][1] << 1; |