Commit 26ee5ca0 authored by Martin Storsjö's avatar Martin Storsjö

h264: Get rid of unnecessary casts

This gets rid of a number of warnings about casts discarding
qualifiers from the pointer target, present since 7ebfb466.
Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent fae6fd5b
...@@ -102,7 +102,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h) ...@@ -102,7 +102,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h)
const int bit_depth = h->sps.bit_depth_luma; const int bit_depth = h->sps.bit_depth_luma;
int j; int j;
GetBitContext gb; GetBitContext gb;
init_get_bits(&gb, (uint8_t *)h->intra_pcm_ptr, init_get_bits(&gb, h->intra_pcm_ptr,
ff_h264_mb_sizes[h->sps.chroma_format_idc] * bit_depth); ff_h264_mb_sizes[h->sps.chroma_format_idc] * bit_depth);
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
...@@ -137,7 +137,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h) ...@@ -137,7 +137,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h)
} }
} else { } else {
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
memcpy(dest_y + i * linesize, (uint8_t *)h->intra_pcm_ptr + i * 16, 16); memcpy(dest_y + i * linesize, h->intra_pcm_ptr + i * 16, 16);
if (SIMPLE || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) { if (SIMPLE || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) {
if (!h->sps.chroma_format_idc) { if (!h->sps.chroma_format_idc) {
for (i = 0; i < block_h; i++) { for (i = 0; i < block_h; i++) {
...@@ -145,8 +145,8 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h) ...@@ -145,8 +145,8 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h)
memset(dest_cr + i * uvlinesize, 128, 8); memset(dest_cr + i * uvlinesize, 128, 8);
} }
} else { } else {
uint8_t *src_cb = (uint8_t *)h->intra_pcm_ptr + 256; const uint8_t *src_cb = h->intra_pcm_ptr + 256;
uint8_t *src_cr = (uint8_t *)h->intra_pcm_ptr + 256 + block_h * 8; const uint8_t *src_cr = h->intra_pcm_ptr + 256 + block_h * 8;
for (i = 0; i < block_h; i++) { for (i = 0; i < block_h; i++) {
memcpy(dest_cb + i * uvlinesize, src_cb + i * 8, 8); memcpy(dest_cb + i * uvlinesize, src_cb + i * 8, 8);
memcpy(dest_cr + i * uvlinesize, src_cr + i * 8, 8); memcpy(dest_cr + i * uvlinesize, src_cr + i * 8, 8);
...@@ -328,7 +328,7 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h) ...@@ -328,7 +328,7 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h)
if (PIXEL_SHIFT) { if (PIXEL_SHIFT) {
const int bit_depth = h->sps.bit_depth_luma; const int bit_depth = h->sps.bit_depth_luma;
GetBitContext gb; GetBitContext gb;
init_get_bits(&gb, (uint8_t *)h->intra_pcm_ptr, 768 * bit_depth); init_get_bits(&gb, h->intra_pcm_ptr, 768 * bit_depth);
for (p = 0; p < plane_count; p++) for (p = 0; p < plane_count; p++)
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
...@@ -340,7 +340,7 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h) ...@@ -340,7 +340,7 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h)
for (p = 0; p < plane_count; p++) for (p = 0; p < plane_count; p++)
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
memcpy(dest[p] + i * linesize, memcpy(dest[p] + i * linesize,
(uint8_t *)h->intra_pcm_ptr + p * 256 + i * 16, 16); h->intra_pcm_ptr + p * 256 + i * 16, 16);
} }
} else { } else {
if (IS_INTRA(mb_type)) { if (IS_INTRA(mb_type)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment