* commit 'e6287f07':
  h264: move {mv,ref}_cache into the per-slice context

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