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:14 +0100 |
| commit | 0edbe6faa7ef80daf0e84353cbe733389bf1a522 (patch) | |
| tree | 95ebe3620f648479a9baf11d15b43a34c6800f23 /libavcodec/h264.c | |
| parent | 07c5ca551b7327d3c4e33738cc0cd2d5ac2779fa (diff) | |
| download | ffmpeg-0edbe6faa7ef80daf0e84353cbe733389bf1a522.tar.gz | |
h264: move mb_xy into the per-slice context
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 554c3d1f94..39d026f225 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -60,7 +60,7 @@ static void h264_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type, h->mb_x = mb_x; h->mb_y = mb_y; - h->mb_xy = mb_x + mb_y * h->mb_stride; + sl->mb_xy = mb_x + mb_y * h->mb_stride; 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 @@ -69,7 +69,7 @@ static void h264_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type, * practice then correct remapping should be added. */ if (ref >= sl->ref_count[0]) ref = 0; - fill_rectangle(&h->cur_pic.ref_index[0][4 * h->mb_xy], + fill_rectangle(&h->cur_pic.ref_index[0][4 * sl->mb_xy], 2, 2, 2, ref, 1); fill_rectangle(&sl->ref_cache[0][scan8[0]], 4, 4, 8, ref, 1); fill_rectangle(sl->mv_cache[0][scan8[0]], 4, 4, 8, |