diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:42:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:42:44 +0100 |
| commit | 61635c7a8822d13bc8da69e116f40738be43539a (patch) | |
| tree | 79aacaa9fc966147d4c88d4465034e7eefa5d327 /libavcodec/svq3.c | |
| parent | a2740a060b36f6612043fa3128f4eb6197d0ce13 (diff) | |
| parent | 8b00f4df20f4a8ab0656fdaf7d00233a6515a052 (diff) | |
| download | ffmpeg-streaming-61635c7a8822d13bc8da69e116f40738be43539a.zip ffmpeg-streaming-61635c7a8822d13bc8da69e116f40738be43539a.tar.gz | |
Merge commit '8b00f4df20f4a8ab0656fdaf7d00233a6515a052'
* commit '8b00f4df20f4a8ab0656fdaf7d00233a6515a052':
h264: move some neighbour information into the per-slice context
Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 410c4f6..c264049 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -376,6 +376,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; @@ -393,7 +394,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; |
