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>

diff --cc common.mak
index 8775b02,b134835..c42ea9f
--- 1/common.mak
--- 2/common.mak
+++ b/common.mak
@@@ -117,14 -43,14 +117,14 @@@ $(HOSTPROGS): %$(HOSTEXESUF): %.
        $(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
 +CLEANSUFFIXES     = *.d *.o *~ *.h.c *.map *.ver *.ho *.gcno *.gcda
  DISTCLEANSUFFIXES = *.pc
  LIBSUFFIXES       = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a
  

diff --cc libavcodec/h264_mb_template.c
index 6c62a76,b596567..8830d34
--- 1/libavcodec/h264_mb_template.c
--- 2/libavcodec/h264_mb_template.c
+++ b/libavcodec/h264_mb_template.c
@@@ -98,11 -98,11 +98,11 @@@ static av_noinline void FUNC(hl_decode_
      }
  
      if (!SIMPLE && IS_INTRA_PCM(mb_type)) {
 +        const int bit_depth = h->sps.bit_depth_luma;
          if (PIXEL_SHIFT) {
 -            const int bit_depth = h->sps.bit_depth_luma;
              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,16 -137,16 +134,16 @@@
              }
          } 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 < block_h; i++) {
 -                        memset(dest_cb + i * uvlinesize, 128, 8);
 -                        memset(dest_cr + i * uvlinesize, 128, 8);
 +                    for (i = 0; i < 8; i++) {
 +                        memset(dest_cb + i*uvlinesize, 1 << (bit_depth - 1), 8);
 +                        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);