diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:57:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:57:21 +0100 |
| commit | c9841c05be67908e0980dafe0f7585ba47cbfe28 (patch) | |
| tree | 962eb94bdac044eb1bf6f054d0c1f85f158190ec /libavcodec/h264_mvpred.h | |
| parent | a4952e7343f9a77d2995d699ac045b095ab11052 (diff) | |
| parent | a67f8ae9a2c8529bf6a635e8ca4e3483592708b1 (diff) | |
| download | ffmpeg-c9841c05be67908e0980dafe0f7585ba47cbfe28.tar.gz | |
Merge commit 'a67f8ae9a2c8529bf6a635e8ca4e3483592708b1'
* commit 'a67f8ae9a2c8529bf6a635e8ca4e3483592708b1':
h264: move mvd_table into the per-slice context
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mvpred.h')
| -rw-r--r-- | libavcodec/h264_mvpred.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_mvpred.h b/libavcodec/h264_mvpred.h index 9da3a5798f..24fcde5c20 100644 --- a/libavcodec/h264_mvpred.h +++ b/libavcodec/h264_mvpred.h @@ -689,7 +689,7 @@ static void fill_decode_caches(H264Context *h, H264SliceContext *sl, int mb_type if (!(mb_type & (MB_TYPE_SKIP | MB_TYPE_DIRECT2))) { uint8_t(*mvd_cache)[2] = &h->mvd_cache[list][scan8[0]]; - uint8_t(*mvd)[2] = h->mvd_table[list]; + uint8_t(*mvd)[2] = sl->mvd_table[list]; ref_cache[2 + 8 * 0] = ref_cache[2 + 8 * 2] = PART_NOT_AVAILABLE; AV_ZERO32(mv_cache[2 + 8 * 0]); |