Merge commit '43dd004747fa697396b47d034a80e069facbea09'

[ffmpeg] / libavcodec / hevc_parse.c

diff --git a/libavcodec/hevc_parse.c b/libavcodec/hevc_parse.c
index 66a65365159b64cd0f962188ffa9d5f764f6909c..63ed84a8de78bb963da247ee3837d34540f13cf4 100644 (file)
--- a/libavcodec/hevc_parse.c
+++ b/libavcodec/hevc_parse.c
@@ -91,7 +91,7 @@ int ff_hevc_extract_rbsp(HEVCContext *s, const uint8_t *src, int length,
     }
 
     av_fast_malloc(&nal->rbsp_buffer, &nal->rbsp_buffer_size,
-                   length + FF_INPUT_BUFFER_PADDING_SIZE);
+                   length + AV_INPUT_BUFFER_PADDING_SIZE);
     if (!nal->rbsp_buffer)
         return AVERROR(ENOMEM);
 
@@ -137,7 +137,7 @@ int ff_hevc_extract_rbsp(HEVCContext *s, const uint8_t *src, int length,
         dst[di++] = src[si++];
 
 nsc:
-    memset(dst + di, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+    memset(dst + di, 0, AV_INPUT_BUFFER_PADDING_SIZE);
 
     nal->data = dst;
     nal->size = di;