hevc: cleaning disable field in deblocking filter(cherry picked from commit 7dd7a27ae...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 3bc8c68..bfe1ab8 100644 (file)
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -1736,7 +1736,6 @@ static int hls_slice_data(HEVCContext *s)
 
         hls_sao_param(s, x_ctb >> s->sps->log2_ctb_size, y_ctb >> s->sps->log2_ctb_size);
 
-        s->deblock[ctb_addr_rs].disable     = s->sh.disable_deblocking_filter_flag;
         s->deblock[ctb_addr_rs].beta_offset = s->sh.beta_offset;
         s->deblock[ctb_addr_rs].tc_offset   = s->sh.tc_offset;
         s->filter_slice_edges[ctb_addr_rs]  = s->sh.slice_loop_filter_across_slices_enabled_flag;

diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h
index adad57c..9091862 100644 (file)
--- a/libavcodec/hevc.h
+++ b/libavcodec/hevc.h
@@ -669,7 +669,6 @@ typedef struct SAOParams {
 } SAOParams;
 
 typedef struct DBParams {
-    uint8_t disable;
     int beta_offset;
     int tc_offset;
 } DBParams;