Renamed source folder

Author: Andrea Medeghini

Dockerfile.linux

@@ -2,8 +2,8 @@ FROM ffmpeg4java-repo:latest
 
 RUN apt-get update && apt-get -y install make gcc g++
 
-COPY Makefile.lib.linux ffmpeg/Makefile.lib.linux
-COPY Makefile.jni.linux ffmpeg/Makefile.jni.linux
+COPY Makefile.lib.linux FFmpeg/Makefile.lib.linux
+COPY Makefile.jni.linux FFmpeg/Makefile.jni.linux
 
 COPY Patch.linux Patch.linux
 

Dockerfile.mingw64

@@ -2,8 +2,8 @@ FROM ffmpeg4java-repo:latest
 
 RUN apt-get update && apt-get -y install make mingw-w64
 
-COPY Makefile.lib.mingw64 ffmpeg/Makefile.lib.mingw64
-COPY Makefile.jni.mingw64 ffmpeg/Makefile.jni.mingw64
+COPY Makefile.lib.mingw64 FFmpeg/Makefile.lib.mingw64
+COPY Makefile.jni.mingw64 FFmpeg/Makefile.jni.mingw64
 
 COPY Patch.mingw64 Patch.mingw64
 

Patch.linux

@@ -1,7 +1,7 @@
 diff --git a/libavutil/dict.c b/libavutil/dict.c
 index f70c7e0..a53dc4a 100644
---- /ffmpeg/libavutil/dict.c
-+++ /ffmpeg/libavutil/dict.c
+--- /FFmpeg/libavutil/dict.c
++++ /FFmpeg/libavutil/dict.c
 @@ -26,11 +26,6 @@
  #include "mem.h"
  #include "bprint.h"
@@ -16,8 +16,8 @@ index f70c7e0..a53dc4a 100644
      return m ? m->count : 0;
 diff --git a/libavutil/dict.h b/libavutil/dict.h
 index 118f1f0..1659490 100644
---- /ffmpeg/libavutil/dict.h
-+++ /ffmpeg/libavutil/dict.h
+--- /FFmpeg/libavutil/dict.h
++++ /FFmpeg/libavutil/dict.h
 @@ -83,7 +83,10 @@ typedef struct AVDictionaryEntry {
      char *value;
  } AVDictionaryEntry;

Patch.macos

@@ -1,7 +1,7 @@
 diff --git a/libavutil/dict.c b/libavutil/dict.c
 index f70c7e0..a53dc4a 100644
---- ffmpeg/libavutil/dict.c
-+++ ffmpeg/libavutil/dict.c
+--- FFmpeg/libavutil/dict.c
++++ FFmpeg/libavutil/dict.c
 @@ -26,11 +26,6 @@
  #include "mem.h"
  #include "bprint.h"
@@ -16,8 +16,8 @@ index f70c7e0..a53dc4a 100644
      return m ? m->count : 0;
 diff --git a/libavutil/dict.h b/libavutil/dict.h
 index 118f1f0..1659490 100644
---- ffmpeg/libavutil/dict.h
-+++ ffmpeg/libavutil/dict.h
+--- FFmpeg/libavutil/dict.h
++++ FFmpeg/libavutil/dict.h
 @@ -83,7 +83,10 @@ typedef struct AVDictionaryEntry {
      char *value;
  } AVDictionaryEntry;

Patch.mingw64

@@ -27,8 +27,8 @@ diff -u /usr/share/mingw-w64/include/servprov.h /usr/share/mingw-w64/include/ser
 
 diff --git a/libavutil/dict.c b/libavutil/dict.c
 index f70c7e0..a53dc4a 100644
---- /ffmpeg/libavutil/dict.c
-+++ /ffmpeg/libavutil/dict.c
+--- /FFmpeg/libavutil/dict.c
++++ /FFmpeg/libavutil/dict.c
 @@ -26,11 +26,6 @@
  #include "mem.h"
  #include "bprint.h"
@@ -43,8 +43,8 @@ index f70c7e0..a53dc4a 100644
      return m ? m->count : 0;
 diff --git a/libavutil/dict.h b/libavutil/dict.h
 index 118f1f0..1659490 100644
---- /ffmpeg/libavutil/dict.h
-+++ /ffmpeg/libavutil/dict.h
+--- /FFmpeg/libavutil/dict.h
++++ /FFmpeg/libavutil/dict.h
 @@ -83,7 +83,10 @@ typedef struct AVDictionaryEntry {
      char *value;
  } AVDictionaryEntry;

README.md

@@ -69,7 +69,7 @@ The Java code will be generated in directory:
 
 The JNI code will be generated in file:
 
-    build/ffmpeg4java_wrap.cxx
+    build/ffmpeg4java_wrap.c
 
 
 ## Build library for MacOS

build-linux.sh

@@ -3,7 +3,7 @@ export BUILD_DIR=`pwd`/build
 
 patch -p0 < Patch.linux
 
-cd ffmpeg
+cd FFmpeg
 
-make -f Makefile.lib.linux ffmpeg
+make -f Makefile.lib.linux FFmpeg
 make -f Makefile.jni.linux all

build-macos.sh

@@ -1,16 +1,16 @@
 #/bin/sh
 export BUILD_DIR=`pwd`/build
 
-rm -fR ffmpeg
+rm -fR FFmpeg
 
 sh checkout.sh
 
-cp Makefile.lib.macos ffmpeg/Makefile.lib.macos
-cp Makefile.jni.macos ffmpeg/Makefile.jni.macos
+cp Makefile.lib.macos FFmpeg/Makefile.lib.macos
+cp Makefile.jni.macos FFmpeg/Makefile.jni.macos
 
 patch -p0 < Patch.macos
 
-cd ffmpeg
+cd FFmpeg
 
 make -f Makefile.lib.macos ffmpeg
 make -f Makefile.jni.macos all

build-mingw64.sh

@@ -3,7 +3,7 @@ export BUILD_DIR=`pwd`/build
 
 patch -p0 < Patch.mingw64
 
-cd ffmpeg
+cd FFmpeg
 
 make -f Makefile.lib.mingw64 ffmpeg
 make -f Makefile.jni.mingw64 all

checkout.sh

@@ -1,5 +1,5 @@
 #/bin/sh
 
-git clone https://github.com/nextbreakpoint/FFmpeg.git ffmpeg
+git clone https://github.com/nextbreakpoint/FFmpeg.git FFmpeg
 
 cd ffmpeg && git checkout ce36e74e75751c721185fbebaa4ee8714b44c5a5