Upstream: https://github.com/AGProjects/python-sipsimple/pull/3 From f96d1e8637f817dc76188742d2e0e1b7b2776581 Mon Sep 17 00:00:00 2001 From: Benjamin Lamowski Date: Tue, 22 May 2018 10:11:06 -0400 Subject: [PATCH] pjsip: fix compilation error with FFmpeg 2.8.14 --- deps/pjsip/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/pjsip/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c b/deps/pjsip/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c index cf859408..097479f6 100644 --- a/deps/pjsip/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c +++ b/deps/pjsip/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c @@ -1684,12 +1684,12 @@ static pj_status_t ffmpeg_codec_decode_whole(pjmedia_vid_codec *codec, avpacket.size = (int)input->size; /* ffmpeg warns: - * - input buffer padding, at least FF_INPUT_BUFFER_PADDING_SIZE + * - input buffer padding, at least AV_INPUT_BUFFER_PADDING_SIZE * - null terminated * Normally, encoded buffer is allocated more than needed, so lets just * bzero the input buffer end/pad, hope it will be just fine. */ - pj_bzero(avpacket.data+avpacket.size, FF_INPUT_BUFFER_PADDING_SIZE); + pj_bzero(avpacket.data+avpacket.size, AV_INPUT_BUFFER_PADDING_SIZE); output->bit_info = 0; output->timestamp = input->timestamp;