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_slice.c | |
| parent | 07c5ca551b7327d3c4e33738cc0cd2d5ac2779fa (diff) | |
| download | ffmpeg-0edbe6faa7ef80daf0e84353cbe733389bf1a522.tar.gz | |
h264: move mb_xy into the per-slice context
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 1e233ad27e..64dae07a16 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1909,7 +1909,7 @@ static av_always_inline void fill_filter_caches_inter(H264Context *h, */ static int fill_filter_caches(H264Context *h, H264SliceContext *sl, int mb_type) { - const int mb_xy = h->mb_xy; + const int mb_xy = sl->mb_xy; int top_xy, left_xy[LEFT_MBS]; int top_type, left_type[LEFT_MBS]; uint8_t *nnz; @@ -2065,7 +2065,7 @@ static void loop_filter(H264Context *h, H264SliceContext *sl, int start_x, int e for (mb_x = start_x; mb_x < end_x; mb_x++) for (mb_y = end_mb_y - FRAME_MBAFF(h); mb_y <= end_mb_y; mb_y++) { int mb_xy, mb_type; - mb_xy = h->mb_xy = mb_x + mb_y * h->mb_stride; + mb_xy = sl->mb_xy = mb_x + mb_y * h->mb_stride; sl->slice_num = h->slice_table[mb_xy]; mb_type = h->cur_pic.mb_type[mb_xy]; sl->list_count = h->list_counts[mb_xy]; |