diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-06-29 23:48:34 +0200 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-07-27 15:24:59 +0100 |
| commit | 059a934806d61f7af9ab3fd9f74994b838ea5eba (patch) | |
| tree | 119be3b4b7b599563205c350f92e5201424510c8 /libavcodec/utils.c | |
| parent | def97856de6021965db86c25a732d78689bd6bb0 (diff) | |
| download | ffmpeg-059a934806d61f7af9ab3fd9f74994b838ea5eba.tar.gz | |
lavc: Consistently prefix input buffer defines
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 50311dee68..2f0997a1a4 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -59,14 +59,14 @@ static void *avformat_mutex; void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size) { void **p = ptr; - if (min_size > SIZE_MAX - FF_INPUT_BUFFER_PADDING_SIZE) { + if (min_size > SIZE_MAX - AV_INPUT_BUFFER_PADDING_SIZE) { av_freep(p); *size = 0; return; } - av_fast_malloc(p, size, min_size + FF_INPUT_BUFFER_PADDING_SIZE); + av_fast_malloc(p, size, min_size + AV_INPUT_BUFFER_PADDING_SIZE); if (*size) - memset((uint8_t *)*p + min_size, 0, FF_INPUT_BUFFER_PADDING_SIZE); + memset((uint8_t *)*p + min_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); } /* encoder management */ @@ -1324,7 +1324,7 @@ FF_ENABLE_DEPRECATION_WARNINGS int ff_alloc_packet(AVPacket *avpkt, int size) { - if (size > INT_MAX - FF_INPUT_BUFFER_PADDING_SIZE) + if (size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) return AVERROR(EINVAL); if (avpkt->data) { |