Merge commit 'a9b201cacf85d710b102010cb4baef97f00ea39b'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 15:06:53 +0000 (16:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 15:06:57 +0000 (16:06 +0100)
commit04d23cf1c5f678f5fe0fe0eb5fd92a59c70e8c42
treeda717a856506847fcad679c9487714044be1275e
parent7d23931632ea3af55ec4ddb1e572ff31aa2c1e9a
parenta9b201cacf85d710b102010cb4baef97f00ea39b
Merge commit 'a9b201cacf85d710b102010cb4baef97f00ea39b'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dxva2_h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_slice.c
libavcodec/vaapi_h264.c