Merge commit '92c6c2a605f9b077b8fbc25b7ed6625541232b87'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 12:13:12 +0000 (13:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 12:13:12 +0000 (13:13 +0100)
commit756dc7bd18b88fdde5c06c701375a6570500e58c
tree731502f3a57bdcc81d35202cc50da7770f38ef68
parent06c70d45373dedc600f28e345685b130b60203c1
parent92c6c2a605f9b077b8fbc25b7ed6625541232b87
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@gmx.at>
libavcodec/dxva2_h264.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_mb.c
libavcodec/h264_mb_template.c
libavcodec/h264_mc_template.c
libavcodec/h264_parser.c
libavcodec/h264_refs.c
libavcodec/h264_slice.c
libavcodec/svq3.c
libavcodec/vaapi_h264.c