* commit '0edbe6fa':
  h264: move mb_xy into the per-slice context

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