Merge commit 'f5e486f6f8c242bb2be01ad3ae952b5733ba1113'

[ffmpeg] / libavformat / flac_picture.c

diff --git a/libavformat/flac_picture.c b/libavformat/flac_picture.c
index 669fd2e7825f973802d01b29d4307bb601f80222..7bd98258e4f7974599115868db5998daba605277 100644 (file)
--- a/libavformat/flac_picture.c
+++ b/libavformat/flac_picture.c
@@ -108,10 +108,10 @@ int ff_flac_parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size)
             ret = AVERROR_INVALIDDATA;
         goto fail;
     }
-    if (!(data = av_buffer_alloc(len + FF_INPUT_BUFFER_PADDING_SIZE))) {
+    if (!(data = av_buffer_alloc(len + AV_INPUT_BUFFER_PADDING_SIZE))) {
         RETURN_ERROR(AVERROR(ENOMEM));
     }
-    memset(data->data + len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+    memset(data->data + len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
     if (avio_read(pb, data->data, len) != len) {
         av_log(s, AV_LOG_ERROR, "Error reading attached picture data.\n");
         if (s->error_recognition & AV_EF_EXPLODE)