diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:24:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:24:23 +0100 |
| commit | c27f53b9fbcd8f638afecc637ef844b612cc39be (patch) | |
| tree | 7c6588de62ee97cddb5ddd1f6c77fd4fb7a0c9d3 /libavcodec/h264_mvpred.h | |
| parent | cc31d9ce80abd8b2a1a446f73a8651e2f1d76853 (diff) | |
| parent | d231e84b06a9964c840cff4e228509f706165fb6 (diff) | |
Merge commit 'd231e84b06a9964c840cff4e228509f706165fb6'
* commit 'd231e84b06a9964c840cff4e228509f706165fb6':
h264: move the quantizers into the per-slice context
Conflicts:
libavcodec/dxva2_h264.c
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mvpred.h')
| -rw-r--r-- | libavcodec/h264_mvpred.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_mvpred.h b/libavcodec/h264_mvpred.h index 5f1e9a1ee5..278be61382 100644 --- a/libavcodec/h264_mvpred.h +++ b/libavcodec/h264_mvpred.h @@ -794,7 +794,7 @@ static void fill_decode_caches(H264Context *h, int mb_type) /** * decodes a P_SKIP or B_SKIP macroblock */ -static void av_unused decode_mb_skip(H264Context *h) +static void av_unused decode_mb_skip(H264Context *h, H264SliceContext *sl) { const int mb_xy = h->mb_xy; int mb_type = 0; @@ -822,7 +822,7 @@ static void av_unused decode_mb_skip(H264Context *h) write_back_motion(h, mb_type); h->cur_pic.mb_type[mb_xy] = mb_type; - h->cur_pic.qscale_table[mb_xy] = h->qscale; + h->cur_pic.qscale_table[mb_xy] = sl->qscale; h->slice_table[mb_xy] = h->slice_num; h->prev_mb_skipped = 1; } |