Created patches for ffmpeg

Author: Andrea Medeghini

Dockerfile.linux

@@ -7,6 +7,9 @@ RUN git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
 COPY Makefile.lib.linux ffmpeg/Makefile.lib.linux
 COPY Makefile.jni.linux ffmpeg/Makefile.jni.linux
 
+COPY Patch.linux ffmpeg/Patch.linux
+RUN patch -p0 < ffmpeg/Patch.linux
+
 COPY build-linux.sh build-linux.sh
 
 RUN chmod 700 build-linux.sh

Dockerfile.mingw64

@@ -7,8 +7,8 @@ RUN git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
 COPY Makefile.lib.mingw64 ffmpeg/Makefile.lib.mingw64
 COPY Makefile.jni.mingw64 ffmpeg/Makefile.jni.mingw64
 
-COPY mingw64.patch ffmpeg/mingw64.patch
-RUN patch -p0 < ffmpeg/mingw64.patch
+COPY Patch.mingw64 ffmpeg/Patch.mingw64
+RUN patch -p0 < ffmpeg/Patch.mingw64
 
 COPY build-mingw64.sh build-mingw64.sh
 

Patch.linux

@@ -0,0 +1,14 @@
+diff --git a/libavutil/dict.h b/libavutil/dict.h
+index 118f1f0..df4bd04 100644
+--- /ffmpeg/libavutil/dict.h
++++ /ffmpeg/libavutil/dict.h
+@@ -83,7 +83,8 @@ typedef struct AVDictionaryEntry {
+     char *value;
+ } AVDictionaryEntry;
+ 
+-typedef struct AVDictionary AVDictionary;
++typedef struct AVDictionary {
++} AVDictionary;
+ 
+ /**
+  * Get a dictionary entry with matching key.

Patch.macos

@@ -0,0 +1,14 @@
+diff --git a/libavutil/dict.h b/libavutil/dict.h
+index 118f1f0..df4bd04 100644
+--- ffmpeg/libavutil/dict.h
++++ ffmpeg/libavutil/dict.h
+@@ -83,7 +83,8 @@ typedef struct AVDictionaryEntry {
+     char *value;
+ } AVDictionaryEntry;
+ 
+-typedef struct AVDictionary AVDictionary;
++typedef struct AVDictionary {
++} AVDictionary;
+ 
+ /**
+  * Get a dictionary entry with matching key.

mingw64.patch Patch.mingw64mingw64.patch renamed to Patch.mingw64

@@ -24,3 +24,19 @@ diff -u /usr/share/mingw-w64/include/servprov.h /usr/share/mingw-w64/include/ser
  }
  };
  }
+
+
+diff --git a/libavutil/dict.h b/libavutil/dict.h
+index 118f1f0..df4bd04 100644
+--- /ffmpeg/libavutil/dict.h
++++ /ffmpeg/libavutil/dict.h
+@@ -83,7 +83,8 @@ typedef struct AVDictionaryEntry {
+     char *value;
+ } AVDictionaryEntry;
+ 
+-typedef struct AVDictionary AVDictionary;
++typedef struct AVDictionary {
++} AVDictionary;
+ 
+ /**
+  * Get a dictionary entry with matching key.

build-macos.sh

@@ -6,9 +6,11 @@ rm -fR ffmpeg
 git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
 
 cp Makefile.lib.macos ffmpeg/Makefile.lib.macos
-
 cp Makefile.jni.macos ffmpeg/Makefile.jni.macos
 
+cp Patch.macos ffmpeg/Patch.macos
+patch -p0 < ffmpeg/Patch.macos
+
 cd ffmpeg
 
 make -f Makefile.lib.macos ffmpeg

ffmpeg4java.i

@@ -852,7 +852,8 @@ typedef struct AVDictionaryEntry {
     char *value;
 } AVDictionaryEntry;
 
-typedef struct AVDictionary {} AVDictionary;
+typedef struct AVDictionary {
+} AVDictionary;
 
 /**
  * Get a dictionary entry with matching key.