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/dxva2_h264.c | |
| parent | cc31d9ce80abd8b2a1a446f73a8651e2f1d76853 (diff) | |
| parent | d231e84b06a9964c840cff4e228509f706165fb6 (diff) | |
| download | ffmpeg-c27f53b9fbcd8f638afecc637ef844b612cc39be.tar.gz | |
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/dxva2_h264.c')
| -rw-r--r-- | libavcodec/dxva2_h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c index c5dccfe749..cc571536fa 100644 --- a/libavcodec/dxva2_h264.c +++ b/libavcodec/dxva2_h264.c @@ -276,7 +276,7 @@ static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice, } } slice->slice_qs_delta = 0; /* XXX not implemented by FFmpeg */ - slice->slice_qp_delta = h->qscale - h->pps.init_qp; + slice->slice_qp_delta = sl->qscale - h->pps.init_qp; slice->redundant_pic_cnt = h->redundant_pic_count; if (h->slice_type == AV_PICTURE_TYPE_B) slice->direct_spatial_mv_pred_flag = h->direct_spatial_mv_pred; |