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:13 +0100 |
commit | 5f390eef8ee2b8adab00c5d2923a52aa261eb999 (patch) | |
tree | 795f383dbe4f784c2d9bebe4ea517efc6241606b /libavcodec/h264_slice.c | |
parent | 99a35d1ccbb6b6cd260ce5c8369a897a79fe6a3a (diff) | |
download | ffmpeg-streaming-5f390eef8ee2b8adab00c5d2923a52aa261eb999.zip ffmpeg-streaming-5f390eef8ee2b8adab00c5d2923a52aa261eb999.tar.gz |
h264: move mb_[uv]linesize into the per-slice context
Diffstat (limited to 'libavcodec/h264_slice.c')
-rw-r--r-- | libavcodec/h264_slice.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 9255389..22e625f 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -2086,16 +2086,16 @@ static void loop_filter(H264Context *h, H264SliceContext *sl, int start_x, int e // FIXME simplify above if (MB_FIELD(h)) { - linesize = h->mb_linesize = h->linesize * 2; - uvlinesize = h->mb_uvlinesize = h->uvlinesize * 2; + linesize = sl->mb_linesize = h->linesize * 2; + uvlinesize = sl->mb_uvlinesize = h->uvlinesize * 2; if (mb_y & 1) { // FIXME move out of this function? dest_y -= h->linesize * 15; dest_cb -= h->uvlinesize * (block_h - 1); dest_cr -= h->uvlinesize * (block_h - 1); } } else { - linesize = h->mb_linesize = h->linesize; - uvlinesize = h->mb_uvlinesize = h->uvlinesize; + linesize = sl->mb_linesize = h->linesize; + uvlinesize = sl->mb_uvlinesize = h->uvlinesize; } backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 0); |