diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:58:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:58:50 +0100 |
| commit | ad6cee117e83711bf57e8dd90472543dbd61b8b8 (patch) | |
| tree | 05b1168749cbb4487c00c7aa13084c7271aa67bd /libavcodec/h264_mvpred.h | |
| parent | 6a2e1ff02a784ea69fb1a6f71d3357d705506506 (diff) | |
| parent | bd3e460b73dd54a68dc253e010c239cefc8d8d55 (diff) | |
| download | ffmpeg-ad6cee117e83711bf57e8dd90472543dbd61b8b8.tar.gz | |
Merge commit 'bd3e460b73dd54a68dc253e010c239cefc8d8d55'
* commit 'bd3e460b73dd54a68dc253e010c239cefc8d8d55':
h264: move direct_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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_mvpred.h b/libavcodec/h264_mvpred.h index 368fcd47e6..241e90565c 100644 --- a/libavcodec/h264_mvpred.h +++ b/libavcodec/h264_mvpred.h @@ -721,7 +721,7 @@ static void fill_decode_caches(H264Context *h, H264SliceContext *sl, int mb_type AV_ZERO16(mvd_cache[2 + 8 * 0]); AV_ZERO16(mvd_cache[2 + 8 * 2]); if (sl->slice_type_nos == AV_PICTURE_TYPE_B) { - uint8_t *direct_cache = &h->direct_cache[scan8[0]]; + uint8_t *direct_cache = &sl->direct_cache[scan8[0]]; uint8_t *direct_table = h->direct_table; fill_rectangle(direct_cache, 4, 4, 8, MB_TYPE_16x16 >> 1, 1); |