Merge commit '6e92181bf836f48627a4733b6fd240a99fd36365'
authorClément Bœsch <clement@stupeflix.com>
Fri, 1 Jul 2016 12:23:38 +0000 (14:23 +0200)
committerClément Bœsch <clement@stupeflix.com>
Fri, 1 Jul 2016 12:23:38 +0000 (14:23 +0200)
commit5565e271116215a968eec2ac260b91ebe1768f0f
treed0db6c39a7e9cbc05174da4109d19125946544e2
parent2021326f995ff2eda5cd2aae600853f6eddb507d
parent6e92181bf836f48627a4733b6fd240a99fd36365
Merge commit '6e92181bf836f48627a4733b6fd240a99fd36365'

* commit '6e92181bf836f48627a4733b6fd240a99fd36365':
  h264: pass just the PPS to get_chroma_qp()

Merged-by: Clément Bœsch <clement@stupeflix.com>
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
libavcodec/h264_slice.c