diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:30:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:36:57 +0100 |
| commit | 739edc1a7e83cdca27c3defbc3f057e98a3de472 (patch) | |
| tree | 6d7c29f22fd58077d5d20682bc73433179c55a0d /libavcodec/svq3.c | |
| parent | 35a788d953838c1b7f34038ef54fddc3d11994fe (diff) | |
| parent | bf03a878a76dea29b36f368759e9f66102b39a5f (diff) | |
| download | ffmpeg-739edc1a7e83cdca27c3defbc3f057e98a3de472.tar.gz | |
Merge commit 'bf03a878a76dea29b36f368759e9f66102b39a5f'
* commit 'bf03a878a76dea29b36f368759e9f66102b39a5f':
h264: move mb[_{padding,luma_dc}] into the per-slice context
Conflicts:
libavcodec/h264.h
libavcodec/h264_cavlc.c
libavcodec/h264_mb.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/svq3.c')
| -rw-r--r-- | libavcodec/svq3.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 850216bd0c..5a5cf26a33 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -714,9 +714,9 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) } } if (IS_INTRA16x16(mb_type)) { - AV_ZERO128(h->mb_luma_dc[0] + 0); - AV_ZERO128(h->mb_luma_dc[0] + 8); - if (svq3_decode_block(&h->gb, h->mb_luma_dc[0], 0, 1)) { + AV_ZERO128(sl->mb_luma_dc[0] + 0); + AV_ZERO128(sl->mb_luma_dc[0] + 8); + if (svq3_decode_block(&h->gb, sl->mb_luma_dc[0], 0, 1)) { av_log(h->avctx, AV_LOG_ERROR, "error while decoding intra luma dc\n"); return -1; @@ -735,7 +735,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) : (4 * i + j); sl->non_zero_count_cache[scan8[k]] = 1; - if (svq3_decode_block(&h->gb, &h->mb[16 * k], index, type)) { + if (svq3_decode_block(&h->gb, &sl->mb[16 * k], index, type)) { av_log(h->avctx, AV_LOG_ERROR, "error while decoding block\n"); return -1; @@ -745,7 +745,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) if ((cbp & 0x30)) { for (i = 1; i < 3; ++i) - if (svq3_decode_block(&h->gb, &h->mb[16 * 16 * i], 0, 3)) { + if (svq3_decode_block(&h->gb, &sl->mb[16 * 16 * i], 0, 3)) { av_log(h->avctx, AV_LOG_ERROR, "error while decoding chroma dc block\n"); return -1; @@ -757,7 +757,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) k = 16 * i + j; sl->non_zero_count_cache[scan8[k]] = 1; - if (svq3_decode_block(&h->gb, &h->mb[16 * k], 1, 1)) { + if (svq3_decode_block(&h->gb, &sl->mb[16 * k], 1, 1)) { av_log(h->avctx, AV_LOG_ERROR, "error while decoding chroma ac block\n"); return -1; |