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_mb_template.c | |
parent | 07c5ca551b7327d3c4e33738cc0cd2d5ac2779fa (diff) | |
download | ffmpeg-0edbe6faa7ef80daf0e84353cbe733389bf1a522.tar.gz |
h264: move mb_xy into the per-slice context
Diffstat (limited to 'libavcodec/h264_mb_template.c')
-rw-r--r-- | libavcodec/h264_mb_template.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_mb_template.c b/libavcodec/h264_mb_template.c index 8b907b4637..4eca679357 100644 --- a/libavcodec/h264_mb_template.c +++ b/libavcodec/h264_mb_template.c @@ -44,7 +44,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h, H264SliceContext *sl) { const int mb_x = h->mb_x; const int mb_y = h->mb_y; - const int mb_xy = h->mb_xy; + const int mb_xy = sl->mb_xy; const int mb_type = h->cur_pic.mb_type[mb_xy]; uint8_t *dest_y, *dest_cb, *dest_cr; int linesize, uvlinesize /*dct_offset*/; @@ -276,7 +276,7 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h, H264SliceContext { const int mb_x = h->mb_x; const int mb_y = h->mb_y; - const int mb_xy = h->mb_xy; + const int mb_xy = sl->mb_xy; const int mb_type = h->cur_pic.mb_type[mb_xy]; uint8_t *dest[3]; int linesize; |