Merge commit '8a11ce43d08352f7a290355ebb5b29c495ad9609'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Feb 2013 10:54:06 +0000 (11:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Feb 2013 10:54:06 +0000 (11:54 +0100)
commit39b03932c2edee1d96183ace15ca09109d9420d2
tree3b054e055bacfacabfc951cd7740850df41e9ade
parent8c6d9ca6387f25f2dfc47e18cc1def87d733586f
parent8a11ce43d08352f7a290355ebb5b29c495ad9609
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>
common.mak
libavcodec/h264_mb_template.c