Merge commit '324e50ee95929a9491b855c5e15451145bd5d1ec'

[ffmpeg] / libavcodec / hevc_cabac.c

diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c
index cb369eb0c2a6f1482f67f33adb6397034dcf725a..3d16896b3c5f7d0b660a8376d44a96469032303c 100644 (file)
--- a/libavcodec/hevc_cabac.c
+++ b/libavcodec/hevc_cabac.c
@@ -913,7 +913,7 @@ int ff_hevc_cbf_luma_decode(HEVCContext *s, int trafo_depth)
     return GET_CABAC(elem_offset[CBF_LUMA] + !trafo_depth);
 }
 
-static int ff_hevc_transform_skip_flag_decode(HEVCContext *s, int c_idx)
+static int hevc_transform_skip_flag_decode(HEVCContext *s, int c_idx)
 {
     return GET_CABAC(elem_offset[TRANSFORM_SKIP_FLAG] + !!c_idx);
 }
@@ -1115,7 +1115,7 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0,
 
         if (s->pps->transform_skip_enabled_flag &&
             log2_trafo_size <= s->pps->log2_max_transform_skip_block_size) {
-            transform_skip_flag = ff_hevc_transform_skip_flag_decode(s, c_idx);
+            transform_skip_flag = hevc_transform_skip_flag_decode(s, c_idx);
         }
 
         if (c_idx == 0) {