Merge commit '7ebfb466aec2c4628fcd42a72b29034efcaba4bc'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Feb 2013 10:47:32 +0000 (11:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Feb 2013 10:47:32 +0000 (11:47 +0100)
* commit '7ebfb466aec2c4628fcd42a72b29034efcaba4bc':
  h264: Don't store intra pcm samples in h->mb
  get_bits: Return pointer to buffer that is the result of the alignment

Conflicts:
libavcodec/h264_mb_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge