From 84b1919124884232e0fa30b30458470db27c73fc Mon Sep 17 00:00:00 2001
From: James Cowgill <jcowgill@debian.org>
Date: Sat, 18 Aug 2018 12:56:38 +0200
Subject: [PATCH] Use AV_INPUT_BUFFER_PADDING_SIZE to determine padding
 size

Hardcoding the value for FF_INPUT_BUFFER_PADDING_SIZE is not safe
because  upstream FFmpeg might change it (as they did in FFmpeg 4.0).

Instead, use FFmpeg's AV_INPUT_BUFFER_PADDING_SIZE if available and
only hardcode a value if FFmpeg is disabled (in which case the value
doesn't particularly matter anyway). For compatibility with older
FFmpeg versions, define AV_INPUT_BUFFER_PADDING_SIZE if hasn't been
defined yet.

Downloaded from
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901735

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
[Fabrice: updated for 4.3.1]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 src/utils/ffmpeg-priv.h     | 4 ++++
 src/videofilters/nowebcam.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/utils/ffmpeg-priv.h b/src/utils/ffmpeg-priv.h
index c0745a9a..d59ea0e1 100644
--- a/src/utils/ffmpeg-priv.h
+++ b/src/utils/ffmpeg-priv.h
@@ -102,6 +102,10 @@ static inline int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
 #endif
 #endif
 
+#ifndef AV_INPUT_BUFFER_PADDING_SIZE
+#define AV_INPUT_BUFFER_PADDING_SIZE FF_INPUT_BUFFER_PADDING_SIZE
+#endif
+
 #ifndef HAVE_FUN_avcodec_encode_video2
 int avcodec_encode_video2 (AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame, int *got_packet_ptr);
 #endif
-- 
2.18.0