* commit '36d04801':
  h264: move the scratch buffers into the per-slice context

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