[FFmpeg-cvslog] Merge commit '7ebfb466aec2c4628fcd42a72b29034efcaba4bc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 20 11:47:32 2013 +0100| [98f63e1f34b34e97aa41c94e948c5fc869684287] | committer: Michael Niedermayer

Merge commit '7ebfb466aec2c4628fcd42a72b29034efcaba4bc'

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

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