From 0ad8f73f137dad1f3d0f818e22bdb2949186e9ec Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 21 Feb 2014 00:21:22 +0100
Subject: [PATCH] avcodec: fix dxva2 & vaapi after removing the +52 offset from
the loop filter parameters
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavcodec/dxva2_h264.c | 4 ++--
libavcodec/vaapi_h264.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c
index 10905026be6..02d3f541331 100644
--- a/libavcodec/dxva2_h264.c
+++ b/libavcodec/dxva2_h264.c
@@ -218,8 +218,8 @@ static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice,
slice->num_ref_idx_l0_active_minus1 = h->ref_count[0] - 1;
if (h->list_count > 1)
slice->num_ref_idx_l1_active_minus1 = h->ref_count[1] - 1;
- slice->slice_alpha_c0_offset_div2 = h->slice_alpha_c0_offset / 2 - 26;
- slice->slice_beta_offset_div2 = h->slice_beta_offset / 2 - 26;
+ slice->slice_alpha_c0_offset_div2 = h->slice_alpha_c0_offset / 2;
+ slice->slice_beta_offset_div2 = h->slice_beta_offset / 2;
slice->Reserved8Bits = 0;
for (list = 0; list < 2; list++) {
diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
index ea0f43420da..7fdaaf0918b 100644
--- a/libavcodec/vaapi_h264.c
+++ b/libavcodec/vaapi_h264.c
@@ -333,8 +333,8 @@ static int vaapi_h264_decode_slice(AVCodecContext *avctx,
slice_param->cabac_init_idc = h->cabac_init_idc;
slice_param->slice_qp_delta = h->qscale - h->pps.init_qp;
slice_param->disable_deblocking_filter_idc = h->deblocking_filter < 2 ? !h->deblocking_filter : h->deblocking_filter;
- slice_param->slice_alpha_c0_offset_div2 = h->slice_alpha_c0_offset / 2 - 26;
- slice_param->slice_beta_offset_div2 = h->slice_beta_offset / 2 - 26;
+ slice_param->slice_alpha_c0_offset_div2 = h->slice_alpha_c0_offset / 2;
+ slice_param->slice_beta_offset_div2 = h->slice_beta_offset / 2;
slice_param->luma_log2_weight_denom = h->luma_log2_weight_denom;
slice_param->chroma_log2_weight_denom = h->chroma_log2_weight_denom;
--
GitLab