Merge commit '5d8bea3bb2357bb304f8f771a4107039037c5549'

[ffmpeg] / libavcodec / hevc_filter.c

diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c
index cc3aa8ee63e6a5e82b534808cdddeb79a01d2408..1f33b0cdfe51fa71785b1f130c18f1f8a1d56bde 100644 (file)
--- a/libavcodec/hevc_filter.c
+++ b/libavcodec/hevc_filter.c
@@ -349,8 +349,8 @@ static void sao_filter_CTB(HEVCContext *s, int x, int y)
             int sh = s->ps.sps->pixel_shift;
             int left_pixels, right_pixels;
 
-            stride_dst = 2*MAX_PB_SIZE + FF_INPUT_BUFFER_PADDING_SIZE;
-            dst = lc->edge_emu_buffer + stride_dst + FF_INPUT_BUFFER_PADDING_SIZE;
+            stride_dst = 2*MAX_PB_SIZE + AV_INPUT_BUFFER_PADDING_SIZE;
+            dst = lc->edge_emu_buffer + stride_dst + AV_INPUT_BUFFER_PADDING_SIZE;
 
             if (!top_edge) {
                 int left = 1 - left_edge;