diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:58:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:58:05 +0100 |
| commit | 6a2e1ff02a784ea69fb1a6f71d3357d705506506 (patch) | |
| tree | a4f03cfc00291522a295c400b5c5e1b443dc8cd4 /libavcodec/h264_mvpred.h | |
| parent | c9841c05be67908e0980dafe0f7585ba47cbfe28 (diff) | |
| parent | 6479c79f5517e2881bc881e737b2dbce69553878 (diff) | |
Merge commit '6479c79f5517e2881bc881e737b2dbce69553878'
* commit '6479c79f5517e2881bc881e737b2dbce69553878':
h264: move mvd_cache into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mvpred.h')
| -rw-r--r-- | libavcodec/h264_mvpred.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264_mvpred.h b/libavcodec/h264_mvpred.h index 24fcde5c20..368fcd47e6 100644 --- a/libavcodec/h264_mvpred.h +++ b/libavcodec/h264_mvpred.h @@ -688,7 +688,7 @@ static void fill_decode_caches(H264Context *h, H264SliceContext *sl, int mb_type continue; if (!(mb_type & (MB_TYPE_SKIP | MB_TYPE_DIRECT2))) { - uint8_t(*mvd_cache)[2] = &h->mvd_cache[list][scan8[0]]; + uint8_t(*mvd_cache)[2] = &sl->mvd_cache[list][scan8[0]]; uint8_t(*mvd)[2] = sl->mvd_table[list]; ref_cache[2 + 8 * 0] = ref_cache[2 + 8 * 2] = PART_NOT_AVAILABLE; @@ -773,7 +773,7 @@ static void fill_decode_caches(H264Context *h, H264SliceContext *sl, int mb_type if (!IS_INTERLACED(mb_type) && sl->ref_cache[list][idx] >= 0) { \ sl->ref_cache[list][idx] <<= 1; \ sl->mv_cache[list][idx][1] /= 2; \ - h->mvd_cache[list][idx][1] >>= 1; \ + sl->mvd_cache[list][idx][1] >>= 1; \ } MAP_MVS @@ -784,7 +784,7 @@ static void fill_decode_caches(H264Context *h, H264SliceContext *sl, int mb_type if (IS_INTERLACED(mb_type) && sl->ref_cache[list][idx] >= 0) { \ sl->ref_cache[list][idx] >>= 1; \ sl->mv_cache[list][idx][1] <<= 1; \ - h->mvd_cache[list][idx][1] <<= 1; \ + sl->mvd_cache[list][idx][1] <<= 1; \ } MAP_MVS |