>From cdc9e006e05344b15639c01369c98be85bbad615 Mon Sep 17 00:00:00 2001
From: Simon Morlat <address@hidden>
Date: Tue, 6 Sep 2016 11:14:04 +0200
Subject: [PATCH] tolerate newest version of ffmpeg by removing deprecated
 warnings.

---
 src/videofilters/h264dec.c    | 10 ++++++++++
 src/videofilters/jpegwriter.c | 10 ++++++++++
 src/videofilters/nowebcam.c   | 10 ++++++++++
 src/videofilters/videodec.c   | 13 +++++++++++++
 src/videofilters/videoenc.c   | 11 +++++++++++
 5 files changed, 54 insertions(+)

diff --git a/src/videofilters/h264dec.c b/src/videofilters/h264dec.c
index cd04c23..429b15b 100644
--- a/src/videofilters/h264dec.c
+++ b/src/videofilters/h264dec.c
@@ -31,6 +31,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "ffmpeg-priv.h"
 
+#if LIBAVCODEC_VERSION_MAJOR >= 57
+
+#ifdef _MSC_VER
+#pragma warning(disable : 4996)
+#else
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
+#endif
+
 #include "ortp/b64.h"
 
 
diff --git a/src/videofilters/jpegwriter.c b/src/videofilters/jpegwriter.c
index e22ad05..a1fa11d 100644
--- a/src/videofilters/jpegwriter.c
+++ b/src/videofilters/jpegwriter.c
@@ -26,6 +26,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "ffmpeg-priv.h"
 
 
+#if LIBAVCODEC_VERSION_MAJOR >= 57
+
+#ifdef _MSC_VER
+#pragma warning(disable : 4996)
+#else
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
+#endif
+
 typedef struct {
 	FILE *file;
 	char *filename;
diff --git a/src/videofilters/nowebcam.c b/src/videofilters/nowebcam.c
index 0426a9f..da468fd 100644
--- a/src/videofilters/nowebcam.c
+++ b/src/videofilters/nowebcam.c
@@ -40,6 +40,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #define FF_INPUT_BUFFER_PADDING_SIZE 32
 #endif
 
+#if LIBAVCODEC_VERSION_MAJOR >= 57
+
+#ifdef _MSC_VER
+#pragma warning(disable : 4996)
+#else
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
+#endif
+
 #if TARGET_OS_IPHONE
 #include <CoreGraphics/CGDataProvider.h>
 #include <CoreGraphics/CGImage.h>
diff --git a/src/videofilters/videodec.c b/src/videofilters/videodec.c
index 57dc4f3..15f2c2c 100644
--- a/src/videofilters/videodec.c
+++ b/src/videofilters/videodec.c
@@ -33,6 +33,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "mediastreamer2/msticker.h"
 #include "rfc2429.h"
 
+#if LIBAVCODEC_VERSION_MAJOR >= 57
+
+#ifdef _MSC_VER
+#pragma warning(disable : 4996)
+#else
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
+#endif
+
 
 extern void ms_ffmpeg_check_init(void);
 
@@ -698,10 +708,13 @@ static void dec_process_frame(MSFilter *f, mblk_t *inm){
 			s->input=NULL;
 			while ( (remain=frame->b_wptr-frame->b_rptr)> 0) {
 				AVPacket pkt;
+				
 				av_init_packet(&pkt);
 				pkt.data = frame->b_rptr;
 				pkt.size = remain;
+
 				len=avcodec_decode_video2(&s->av_context, s->orig, &got_picture,&pkt);
+
 				if (len<=0) {
 					ms_warning("ms_AVdecoder_process: error %i.",len);
 					ms_filter_notify_no_arg(f,MS_VIDEO_DECODER_DECODING_ERRORS);
diff --git a/src/videofilters/videoenc.c b/src/videofilters/videoenc.c
index cedaacf..055d0d0 100644
--- a/src/videofilters/videoenc.c
+++ b/src/videofilters/videoenc.c
@@ -36,6 +36,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "rfc2429.h"
 
+
+#if LIBAVCODEC_VERSION_MAJOR >= 57
+
+#ifdef _MSC_VER
+#pragma warning(disable : 4996)
+#else
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
+#endif
+
 #define RATE_CONTROL_MARGIN 15000 /*bits/second*/
 
 #define MS_VIDEOENC_CONF(required_bitrate, bitrate_limit, resolution, fps, cpu, qminvalue) \