* commit '92c6c2a6':
  h264: split weighted pred-related vars into per-slice context

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