- fix building with ffmpeg 4.0

- rel 3

diff --git a/ffmpeg4.patch b/ffmpeg4.patch
new file mode 100644 (file)
index 0000000..6b7558c
--- /dev/null
+++ b/ffmpeg4.patch
@@ -0,0 +1,20 @@
+--- mediastreamer-2.12.1/src/videofilters/nowebcam.c~  2018-04-28 19:50:35.000000000 +0200
++++ mediastreamer-2.12.1/src/videofilters/nowebcam.c   2018-04-28 19:53:20.814288813 +0200
+@@ -32,7 +32,7 @@
+ #ifndef NO_FFMPEG
+ #include "ffmpeg-priv.h"
+ #else
+-#define FF_INPUT_BUFFER_PADDING_SIZE 32
++#define AV_INPUT_BUFFER_PADDING_SIZE 32
+ #endif
+ 
+ #if TARGET_OS_IPHONE
+@@ -248,7 +248,7 @@
+                       ms_error("Cannot load %s",jpgpath);
+                       return NULL;
+               }
+-              jpgbuf=(uint8_t*)ms_malloc0(statbuf.st_size + FF_INPUT_BUFFER_PADDING_SIZE);
++              jpgbuf=(uint8_t*)ms_malloc0(statbuf.st_size + AV_INPUT_BUFFER_PADDING_SIZE);
+               if (jpgbuf==NULL)
+               {
+                       close(fd);

diff --git a/mediastreamer.spec b/mediastreamer.spec
index ad2b712fe6d6d0b450a76497a34f5a0cfb7384e1..6be5823594221e74270696ea23def3285a9a6493 100644 (file)
--- a/mediastreamer.spec
+++ b/mediastreamer.spec
@@ -20,7 +20,7 @@ Summary:      Audio/Video real-time streaming
 Summary(pl.UTF-8):     Przesyłanie strumieni audio/video w czasie rzeczywistym 
 Name:          mediastreamer
 Version:       2.12.1
-Release:       2
+Release:       3
 License:       GPL v2+
 Group:         Libraries
 Source0:       http://download-mirror.savannah.gnu.org/releases/linphone/mediastreamer/%{name}-%{version}.tar.gz
@@ -28,6 +28,7 @@ Source0:      http://download-mirror.savannah.gnu.org/releases/linphone/mediastreamer
 Patch0:                %{name}-imagedir.patch
 Patch1:                %{name}-ffmpeg.patch
 Patch2:                %{name}-werror.patch
+Patch3:                ffmpeg4.patch
 URL:           http://www.linphone.org/technical-corner/mediastreamer2/overview
 %{?with_opengl:BuildRequires:  OpenGL-GLX-devel}
 BuildRequires: SDL-devel >= 1.2.0
@@ -144,6 +145,7 @@ Statyczne biblioteki mediastreamer.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -152,6 +154,7 @@ Statyczne biblioteki mediastreamer.
 %{__autoheader}
 %{__automake}
 %configure \
+       --disable-strict \
        --enable-alsa%{!?with_alsa:=no} \
        %{?with_arts:--enable-artsc} \
        %{?with_bcg729:--enable-bcg729} \