diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:25:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:27:29 +0100 |
| commit | 35a788d953838c1b7f34038ef54fddc3d11994fe (patch) | |
| tree | cf8179e051dbf1881f591317f4146a2edbd738dc /libavcodec/h264_mb_template.c | |
| parent | cc2cfdc49786a8268d1514661c17ea96035d6f1d (diff) | |
| parent | b063582e0c4f775a8ba377488bd085595e0e7fae (diff) | |
| download | ffmpeg-35a788d953838c1b7f34038ef54fddc3d11994fe.tar.gz | |
Merge commit 'b063582e0c4f775a8ba377488bd085595e0e7fae'
* commit 'b063582e0c4f775a8ba377488bd085595e0e7fae':
h264: move intra_pcm_ptr into the per-slice context
Conflicts:
libavcodec/h264.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mb_template.c')
| -rw-r--r-- | libavcodec/h264_mb_template.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/h264_mb_template.c b/libavcodec/h264_mb_template.c index 3e3cc05b74..5d7117c6dc 100644 --- a/libavcodec/h264_mb_template.c +++ b/libavcodec/h264_mb_template.c @@ -104,7 +104,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h, H264SliceContext *sl) if (PIXEL_SHIFT) { int j; GetBitContext gb; - init_get_bits(&gb, h->intra_pcm_ptr, + init_get_bits(&gb, sl->intra_pcm_ptr, ff_h264_mb_sizes[h->sps.chroma_format_idc] * bit_depth); for (i = 0; i < 16; i++) { @@ -136,7 +136,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h, H264SliceContext *sl) } } else { for (i = 0; i < 16; i++) - memcpy(dest_y + i * linesize, h->intra_pcm_ptr + i * 16, 16); + memcpy(dest_y + i * linesize, sl->intra_pcm_ptr + i * 16, 16); if (SIMPLE || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) { if (!h->sps.chroma_format_idc) { for (i = 0; i < 8; i++) { @@ -144,8 +144,8 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h, H264SliceContext *sl) memset(dest_cr + i * uvlinesize, 1 << (bit_depth - 1), 8); } } else { - const uint8_t *src_cb = h->intra_pcm_ptr + 256; - const uint8_t *src_cr = h->intra_pcm_ptr + 256 + block_h * 8; + const uint8_t *src_cb = sl->intra_pcm_ptr + 256; + const uint8_t *src_cr = sl->intra_pcm_ptr + 256 + block_h * 8; for (i = 0; i < block_h; i++) { memcpy(dest_cb + i * uvlinesize, src_cb + i * 8, 8); memcpy(dest_cr + i * uvlinesize, src_cr + i * 8, 8); @@ -323,7 +323,7 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h, H264SliceContext if (PIXEL_SHIFT) { const int bit_depth = h->sps.bit_depth_luma; GetBitContext gb; - init_get_bits(&gb, h->intra_pcm_ptr, 768 * bit_depth); + init_get_bits(&gb, sl->intra_pcm_ptr, 768 * bit_depth); for (p = 0; p < plane_count; p++) for (i = 0; i < 16; i++) { @@ -335,7 +335,7 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h, H264SliceContext for (p = 0; p < plane_count; p++) for (i = 0; i < 16; i++) memcpy(dest[p] + i * linesize, - h->intra_pcm_ptr + p * 256 + i * 16, 16); + sl->intra_pcm_ptr + p * 256 + i * 16, 16); } } else { if (IS_INTRA(mb_type)) { |