[FFmpeg-cvslog] Merge commit 'bf03a878a76dea29b36f368759e9f66102b39a5f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 15:30:10 2015 +0100| [739edc1a7e83cdca27c3defbc3f057e98a3de472] | committer: Michael Niedermayer

Merge commit 'bf03a878a76dea29b36f368759e9f66102b39a5f'

* commit 'bf03a878a76dea29b36f368759e9f66102b39a5f':
  h264: move mb[_{padding,luma_dc}] into the per-slice context

Conflicts:
	libavcodec/h264.h
	libavcodec/h264_cavlc.c
	libavcodec/h264_mb.c
	libavcodec/h264_slice.c

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

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