--- modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile.orig	2020-07-17 10:21:33 UTC
+++ modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
@@ -24,7 +24,6 @@ CFLAGS = -fPIC                   \
          -fstack-protector       \
          -Werror=implicit-function-declaration \
          -Werror=trampolines     \
-         -msse2                  \
          -fbuiltin               \
          -DHAVE_STDINT_H         \
          -DLINUX                 \
@@ -41,25 +40,16 @@ PACKAGES_LIBS     := $(shell pkg-config --libs glib-2.
 PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
 PACKAGES_LIBS     := $(shell pkg-config --libs glib-2.0 gobject-2.0)
 
-INCLUDES= -I../../../plugins                          \
-          -I../../../plugins/av                       \
-          -I../../../gstreamer-lite/gstreamer         \
-          -I../../../gstreamer-lite/gstreamer/libs    \
-          $(PACKAGES_INCLUDES)
+INCLUDES = -I../../../plugins -I../../../plugins/av -I../../../gstreamer-lite/gstreamer -I../../../gstreamer-lite/gstreamer/libs -I%%LOCALBASE%%/ffmpeg4/include $(PACKAGES_INCLUDES)
+LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite -L%%LOCALBASE%%/ffmpeg4/lib -lavcodec -lavformat $(PACKAGES_LIBS) -z relro -static-libgcc -static-libstdc++ -Wl,--gc-sections
 
-LDFLAGS = -L$(BUILD_DIR)    \
-          -lgstreamer-lite  \
-           $(PACKAGES_LIBS) \
-          -z relro          \
-          -static-libgcc -static-libstdc++ -Wl,--gc-sections
-
-ifneq ($(strip $(LIBAV_DIR)),)
-INCLUDES += -I$(LIBAV_DIR)/include
-LDFLAGS  += -L$(LIBAV_DIR)/lib/ -lavcodec -lavformat
-else
-INCLUDES += $(shell pkg-config --cflags libavcodec libavformat)
-LDFLAGS  += $(shell pkg-config --libs libavcodec libavformat)
-endif
+# ifneq ($(strip $(LIBAV_DIR)),)
+# INCLUDES += -I$(LIBAV_DIR)/include
+# LDFLAGS  += -L$(LIBAV_DIR)/lib/ -lavcodec -lavformat
+# else
+# INCLUDES += $(shell pkg-config --cflags libavcodec libavformat)
+# LDFLAGS  += $(shell pkg-config --libs libavcodec libavformat)
+# endif
 
 ifeq ($(ARCH), x32)
     CFLAGS += -m32