[FFmpeg-cvslog] Merge commit '8a11ce43d08352f7a290355ebb5b29c495ad9609'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 20 11:54:06 2013 +0100| [39b03932c2edee1d96183ace15ca09109d9420d2] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=39b03932c2edee1d96183ace15ca09109d9420d2
---