* commit '5bf3c0fa':
  h264: drop the now unused per-slice H264Contexts

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