* commit '5f390eef':
  h264: move mb_[uv]linesize into the per-slice context

Conflicts:
	libavcodec/h264.h
	libavcodec/h264_mb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>