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 | d4d9068cdf8f4b2b87ae87a2ef880d243f77b977 (patch) | |
| tree | 2ede3f693c54ca02c41d90549295fe5868f55b54 /libavcodec/h264.h | |
| parent | 0edbe6faa7ef80daf0e84353cbe733389bf1a522 (diff) | |
| download | ffmpeg-d4d9068cdf8f4b2b87ae87a2ef880d243f77b977.tar.gz | |
h264: move mb_{x,y} into the per-slice context
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index ce4e163809..1e0b2327b1 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -356,6 +356,7 @@ typedef struct H264SliceContext { ptrdiff_t mb_linesize; ///< may be equal to s->linesize or s->linesize * 2, for mbaff ptrdiff_t mb_uvlinesize; + int mb_x, mb_y; int mb_xy; int mb_skip_run; int is_complex; @@ -526,7 +527,7 @@ typedef struct H264Context { int x264_build; - int mb_x, mb_y; + int mb_y; int resync_mb_x; int resync_mb_y; int mb_height, mb_width; @@ -1020,7 +1021,7 @@ static av_always_inline void write_back_motion(H264Context *h, int mb_type) { const int b_stride = h->b_stride; - const int b_xy = 4 * h->mb_x + 4 * h->mb_y * h->b_stride; // try mb2b(8)_xy + const int b_xy = 4 * sl->mb_x + 4 * sl->mb_y * h->b_stride; // try mb2b(8)_xy const int b8_xy = 4 * sl->mb_xy; if (USES_LIST(mb_type, 0)) { |