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:14 +0100 |
| commit | 6479c79f5517e2881bc881e737b2dbce69553878 (patch) | |
| tree | b94fcc90fc969c14cdcb5e0c884389a93d7d49e0 /libavcodec/h264.h | |
| parent | a67f8ae9a2c8529bf6a635e8ca4e3483592708b1 (diff) | |
| download | ffmpeg-6479c79f5517e2881bc881e737b2dbce69553878.tar.gz | |
h264: move mvd_cache into the per-slice context
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index cd5788a0aa..29c9746813 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -392,6 +392,7 @@ typedef struct H264SliceContext { */ DECLARE_ALIGNED(16, int16_t, mv_cache)[2][5 * 8][2]; DECLARE_ALIGNED(8, int8_t, ref_cache)[2][5 * 8]; + DECLARE_ALIGNED(16, uint8_t, mvd_cache)[2][5 * 8][2]; DECLARE_ALIGNED(8, uint16_t, sub_mb_type)[4]; @@ -495,7 +496,6 @@ typedef struct H264Context { /* chroma_pred_mode for i4x4 or i16x16, else 0 */ uint8_t *chroma_pred_mode_table; uint8_t (*mvd_table[2])[2]; - DECLARE_ALIGNED(16, uint8_t, mvd_cache)[2][5 * 8][2]; uint8_t *direct_table; uint8_t direct_cache[5 * 8]; @@ -995,7 +995,7 @@ static av_always_inline void write_back_motion_list(H264Context *h, if (CABAC(h)) { uint8_t (*mvd_dst)[2] = &sl->mvd_table[list][FMO ? 8 * h->mb_xy : h->mb2br_xy[h->mb_xy]]; - uint8_t(*mvd_src)[2] = &h->mvd_cache[list][scan8[0]]; + uint8_t(*mvd_src)[2] = &sl->mvd_cache[list][scan8[0]]; if (IS_SKIP(mb_type)) { AV_ZERO128(mvd_dst); } else { |