* commit '066aafce':
  h264: move direct_spatial_mv_pred into the per-slice context

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