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:12 +0100 |
| commit | f69574cf7aca4fe4d57a2155e925f37fc863474d (patch) | |
| tree | d7a953cd7847cc7db8c44e2fe31fa5dca011d321 /libavcodec/h264.c | |
| parent | 64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e (diff) | |
| download | ffmpeg-f69574cf7aca4fe4d57a2155e925f37fc863474d.tar.gz | |
h264: move non_zero_count_cache into the per-slice context
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 8de0673122..2b29389d60 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -56,11 +56,12 @@ static void h264_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type, int mb_x, int mb_y, int mb_intra, int mb_skipped) { H264Context *h = opaque; + H264SliceContext *sl = &h->slice_ctx[0]; h->mb_x = mb_x; h->mb_y = mb_y; h->mb_xy = mb_x + mb_y * h->mb_stride; - memset(h->non_zero_count_cache, 0, sizeof(h->non_zero_count_cache)); + memset(sl->non_zero_count_cache, 0, sizeof(sl->non_zero_count_cache)); assert(ref >= 0); /* FIXME: It is possible albeit uncommon that slice references * differ between slices. We take the easy approach and ignore |