Merge commit '7ebfb466'

* commit '7ebfb466':
  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: NMichael Niedermayer <michaelni@gmx.at>