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/svq3.c | |
| parent | 07c5ca551b7327d3c4e33738cc0cd2d5ac2779fa (diff) | |
| download | ffmpeg-0edbe6faa7ef80daf0e84353cbe733389bf1a522.tar.gz | |
h264: move mb_xy into the per-slice context
Diffstat (limited to 'libavcodec/svq3.c')
| -rw-r--r-- | libavcodec/svq3.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index cb418c6220..bd35942539 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -487,7 +487,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) int cbp = 0; uint32_t vlc; int8_t *top, *left; - const int mb_xy = h->mb_xy; + const int mb_xy = sl->mb_xy; const int b_xy = 4 * h->mb_x + 4 * h->mb_y * h->b_stride; sl->top_samples_available = (h->mb_y == 0) ? 0x33FF : 0xFFFF; @@ -775,7 +775,7 @@ static int svq3_decode_slice_header(AVCodecContext *avctx) SVQ3Context *s = avctx->priv_data; H264Context *h = &s->h; H264SliceContext *sl = &h->slice_ctx[0]; - const int mb_xy = h->mb_xy; + const int mb_xy = sl->mb_xy; int i, header; unsigned slice_id; @@ -1132,7 +1132,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, init_get_bits(&h->gb, buf, 8 * buf_size); - h->mb_x = h->mb_y = h->mb_xy = 0; + h->mb_x = h->mb_y = sl->mb_xy = 0; if (svq3_decode_slice_header(avctx)) return -1; @@ -1248,7 +1248,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, for (h->mb_y = 0; h->mb_y < h->mb_height; h->mb_y++) { for (h->mb_x = 0; h->mb_x < h->mb_width; h->mb_x++) { unsigned mb_type; - h->mb_xy = h->mb_x + h->mb_y * h->mb_stride; + sl->mb_xy = h->mb_x + h->mb_y * h->mb_stride; if ((get_bits_count(&h->gb) + 7) >= h->gb.size_in_bits && ((get_bits_count(&h->gb) & 7) == 0 || |