diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:02:02 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:02:02 +0100 |
commit | b7e0356cc33297d8db12b56051841f914b6f1ba9 (patch) | |
tree | c520d2fee090f90cd02b1565dea019c23dabd6df /libavcodec/svq3.c | |
parent | 6ec279b54c09f47208930021a38a742f2cc09324 (diff) | |
parent | f69574cf7aca4fe4d57a2155e925f37fc863474d (diff) | |
download | ffmpeg-streaming-b7e0356cc33297d8db12b56051841f914b6f1ba9.zip ffmpeg-streaming-b7e0356cc33297d8db12b56051841f914b6f1ba9.tar.gz |
Merge commit 'f69574cf7aca4fe4d57a2155e925f37fc863474d'
* commit 'f69574cf7aca4fe4d57a2155e925f37fc863474d':
h264: move non_zero_count_cache into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/svq3.c')
-rw-r--r-- | libavcodec/svq3.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 754a3f7..0f3e4c6 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -691,7 +691,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) memset(sl->intra4x4_pred_mode + h->mb2br_xy[mb_xy], DC_PRED, 8); } if (!IS_SKIP(mb_type) || h->pict_type == AV_PICTURE_TYPE_B) { - memset(h->non_zero_count_cache + 8, 0, 14 * 8 * sizeof(uint8_t)); + memset(sl->non_zero_count_cache + 8, 0, 14 * 8 * sizeof(uint8_t)); } if (!IS_INTRA16x16(mb_type) && @@ -733,7 +733,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) k = index ? (1 * (j & 1) + 2 * (i & 1) + 2 * (j & 2) + 4 * (i & 2)) : (4 * i + j); - h->non_zero_count_cache[scan8[k]] = 1; + sl->non_zero_count_cache[scan8[k]] = 1; if (svq3_decode_block(&h->gb, &h->mb[16 * k], index, type)) { av_log(h->avctx, AV_LOG_ERROR, @@ -755,7 +755,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) for (i = 1; i < 3; i++) { for (j = 0; j < 4; j++) { k = 16 * i + j; - h->non_zero_count_cache[scan8[k]] = 1; + sl->non_zero_count_cache[scan8[k]] = 1; if (svq3_decode_block(&h->gb, &h->mb[16 * k], 1, 1)) { av_log(h->avctx, AV_LOG_ERROR, |