diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-20 11:54:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-20 11:54:06 +0100 |
| commit | 39b03932c2edee1d96183ace15ca09109d9420d2 (patch) | |
| tree | 3b054e055bacfacabfc951cd7740850df41e9ade | |
| parent | 8c6d9ca6387f25f2dfc47e18cc1def87d733586f (diff) | |
| parent | 8a11ce43d08352f7a290355ebb5b29c495ad9609 (diff) | |
| download | ffmpeg-streaming-39b03932c2edee1d96183ace15ca09109d9420d2.zip ffmpeg-streaming-39b03932c2edee1d96183ace15ca09109d9420d2.tar.gz | |
Merge commit '8a11ce43d08352f7a290355ebb5b29c495ad9609'
* commit '8a11ce43d08352f7a290355ebb5b29c495ad9609':
build: Ensure that output directories for header objects are created
h264: Get rid of unnecessary casts
Conflicts:
common.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | common.mak | 4 | ||||
| -rw-r--r-- | libavcodec/h264_mb_template.c | 12 |
2 files changed, 8 insertions, 8 deletions
@@ -117,12 +117,12 @@ $(HOSTPROGS): %$(HOSTEXESUF): %.o $(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $< $(HOSTLIBS) $(OBJS): | $(sort $(dir $(OBJS))) +$(HOBJS): | $(sort $(dir $(HOBJS))) $(HOSTOBJS): | $(sort $(dir $(HOSTOBJS))) $(TESTOBJS): | $(sort $(dir $(TESTOBJS))) -$(HOBJS): | $(sort $(dir $(HOBJS))) $(TOOLOBJS): | tools -OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOSTOBJS) $(TESTOBJS) $(HOBJS)) +OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(TESTOBJS)) CLEANSUFFIXES = *.d *.o *~ *.h.c *.map *.ver *.ho *.gcno *.gcda DISTCLEANSUFFIXES = *.pc diff --git a/libavcodec/h264_mb_template.c b/libavcodec/h264_mb_template.c index 6c62a76..8830d34 100644 --- a/libavcodec/h264_mb_template.c +++ b/libavcodec/h264_mb_template.c @@ -102,7 +102,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h) if (PIXEL_SHIFT) { int j; 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); for (i = 0; i < 16; i++) { @@ -134,7 +134,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h) } } else { 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 (!h->sps.chroma_format_idc) { for (i = 0; i < 8; i++) { @@ -142,8 +142,8 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h) memset(dest_cr + i*uvlinesize, 1 << (bit_depth - 1), 8); } } else { - uint8_t *src_cb = (uint8_t *)h->intra_pcm_ptr + 256; - uint8_t *src_cr = (uint8_t *)h->intra_pcm_ptr + 256 + block_h * 8; + const uint8_t *src_cb = h->intra_pcm_ptr + 256; + const uint8_t *src_cr = h->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); @@ -321,7 +321,7 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h) if (PIXEL_SHIFT) { const int bit_depth = h->sps.bit_depth_luma; 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 (i = 0; i < 16; i++) { @@ -333,7 +333,7 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h) for (p = 0; p < plane_count; p++) for (i = 0; i < 16; i++) 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 { if (IS_INTRA(mb_type)) { |
