Merge commit 'a9b201cacf85d710b102010cb4baef97f00ea39b'

* commit 'a9b201cacf85d710b102010cb4baef97f00ea39b':
  h264: move cabac_init_idc into the per-slice context

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/dxva2_h264.c
Simple merge

diff --cc libavcodec/h264.h
Simple merge

diff --cc libavcodec/h264_cabac.c
Simple merge

diff --cc libavcodec/h264_slice.c
Simple merge

diff --cc libavcodec/vaapi_h264.c
Simple merge