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:13 +0100 |
| commit | e7226984ac13aacb84eae77a372df8ff7685848f (patch) | |
| tree | 57ef86e9247fbf9abc8ffea1c830f75df509014b /libavcodec/h264_slice.c | |
| parent | 30da98adbda6de1f55188f9058a3a5c715049633 (diff) | |
| download | ffmpeg-e7226984ac13aacb84eae77a372df8ff7685848f.tar.gz | |
h264: move [{top,left}_]cbp into the per-slice context
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index e9a68d2051..ac186a66db 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1993,7 +1993,7 @@ static int fill_filter_caches(H264Context *h, H264SliceContext *sl, int mb_type) AV_COPY32(&nnz_cache[4 + 8 * 2], &nnz[4]); AV_COPY32(&nnz_cache[4 + 8 * 3], &nnz[8]); AV_COPY32(&nnz_cache[4 + 8 * 4], &nnz[12]); - h->cbp = h->cbp_table[mb_xy]; + sl->cbp = h->cbp_table[mb_xy]; if (top_type) { nnz = h->non_zero_count[top_xy]; @@ -2030,22 +2030,22 @@ static int fill_filter_caches(H264Context *h, H264SliceContext *sl, int mb_type) nnz_cache[scan8[0]] = nnz_cache[scan8[1]] = nnz_cache[scan8[2]] = - nnz_cache[scan8[3]] = (h->cbp & 0x1000) >> 12; + nnz_cache[scan8[3]] = (sl->cbp & 0x1000) >> 12; nnz_cache[scan8[0 + 4]] = nnz_cache[scan8[1 + 4]] = nnz_cache[scan8[2 + 4]] = - nnz_cache[scan8[3 + 4]] = (h->cbp & 0x2000) >> 12; + nnz_cache[scan8[3 + 4]] = (sl->cbp & 0x2000) >> 12; nnz_cache[scan8[0 + 8]] = nnz_cache[scan8[1 + 8]] = nnz_cache[scan8[2 + 8]] = - nnz_cache[scan8[3 + 8]] = (h->cbp & 0x4000) >> 12; + nnz_cache[scan8[3 + 8]] = (sl->cbp & 0x4000) >> 12; nnz_cache[scan8[0 + 12]] = nnz_cache[scan8[1 + 12]] = nnz_cache[scan8[2 + 12]] = - nnz_cache[scan8[3 + 12]] = (h->cbp & 0x8000) >> 12; + nnz_cache[scan8[3 + 12]] = (sl->cbp & 0x8000) >> 12; } } |