[FFmpeg-cvslog] Merge commit '92c6c2a605f9b077b8fbc25b7ed6625541232b87'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 13:13:12 2015 +0100| [756dc7bd18b88fdde5c06c701375a6570500e58c] | committer: Michael Niedermayer

Merge commit '92c6c2a605f9b077b8fbc25b7ed6625541232b87'

* commit '92c6c2a605f9b077b8fbc25b7ed6625541232b87':
  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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=756dc7bd18b88fdde5c06c701375a6570500e58c
---