diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-07-01 14:23:38 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-07-01 14:23:38 +0200 |
| commit | 5565e271116215a968eec2ac260b91ebe1768f0f (patch) | |
| tree | d0db6c39a7e9cbc05174da4109d19125946544e2 /libavcodec/h264_cavlc.c | |
| parent | 2021326f995ff2eda5cd2aae600853f6eddb507d (diff) | |
| parent | 6e92181bf836f48627a4733b6fd240a99fd36365 (diff) | |
| download | ffmpeg-5565e271116215a968eec2ac260b91ebe1768f0f.tar.gz | |
Merge commit '6e92181bf836f48627a4733b6fd240a99fd36365'
* commit '6e92181bf836f48627a4733b6fd240a99fd36365':
h264: pass just the PPS to get_chroma_qp()
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'libavcodec/h264_cavlc.c')
| -rw-r--r-- | libavcodec/h264_cavlc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index 3293c66816..16b079eb99 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -1123,8 +1123,8 @@ decode_intra_mb: } } - sl->chroma_qp[0] = get_chroma_qp(h, 0, sl->qscale); - sl->chroma_qp[1] = get_chroma_qp(h, 1, sl->qscale); + sl->chroma_qp[0] = get_chroma_qp(h->ps.pps, 0, sl->qscale); + sl->chroma_qp[1] = get_chroma_qp(h->ps.pps, 1, sl->qscale); if ((ret = decode_luma_residual(h, sl, gb, scan, scan8x8, pixel_shift, mb_type, cbp, 0)) < 0 ) { return -1; |