diff -Nurd -x'*~' gmerlin-avdecoder-1.2.0.orig/configure.ac gmerlin-avdecoder-1.2.0/configure.ac
--- gmerlin-avdecoder-1.2.0.orig/configure.ac	2012-06-08 07:51:34.000000000 -0400
+++ gmerlin-avdecoder-1.2.0/configure.ac	2015-10-17 17:16:11.000000000 -0400
@@ -89,7 +89,7 @@
 fi
 
 AC_SUBST(GMERLIN_DEP_LIBS)
-LDFLAGS="$GMERLIN_DEP_RPATH"
+LDFLAGS="$GMERLIN_DEP_RPATH $LDFLAGS"
 
 
 dnl Check for mingw
diff -Nurd -x'*~' gmerlin-avdecoder-1.2.0.orig/lib/pngreader.c gmerlin-avdecoder-1.2.0/lib/pngreader.c
--- gmerlin-avdecoder-1.2.0.orig/lib/pngreader.c	2012-06-08 07:51:34.000000000 -0400
+++ gmerlin-avdecoder-1.2.0/lib/pngreader.c	2014-01-14 23:59:42.000000000 -0500
@@ -21,6 +21,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <bgav_version.h>
 
 #include <avdec_private.h>
diff -Nurd -x'*~' gmerlin-avdecoder-1.2.0.orig/m4/check_funcs.m4 gmerlin-avdecoder-1.2.0/m4/check_funcs.m4
--- gmerlin-avdecoder-1.2.0.orig/m4/check_funcs.m4	2012-06-08 07:51:27.000000000 -0400
+++ gmerlin-avdecoder-1.2.0/m4/check_funcs.m4	2014-01-15 00:21:59.000000000 -0500
@@ -640,27 +640,7 @@
 
 if test x$test_openjpeg = xtrue; then
    
-OLD_CFLAGS=$CFLAGS
-OLD_LIBS=$LIBS
-
-LIBS="$GMERLIN_DEP_LIBS $LIBS -lopenjpeg -lm"
-CFLAGS="$CFLAGS $GMERLIN_DEP_CFLAGS"
-   
-AC_MSG_CHECKING(for openjpeg)
-AC_TRY_LINK([#include <openjpeg.h>],
-            [opj_version();
-	     return 0;],
-            [have_openjpeg=true])
- 
-case $have_openjpeg in
-  true) AC_DEFINE(HAVE_OPENJPEG)
-        AC_MSG_RESULT(yes)
-        OPENJPEG_LIBS=$LIBS;
-        OPENJPEG_CFLAGS=$CFLAGS ;;
-  false) AC_MSG_RESULT(no); OPENJPEG_LIBS=""; OPENJPEG_CFLAGS="";;
-esac
-CFLAGS=$OLD_CFLAGS
-LIBS=$OLD_LIBS
+PKG_CHECK_MODULES(OPENJPEG, libopenjpeg >= $OPENJPEG_REQUIRED, have_openjpeg="true", test_openjpeg="false")
 
 fi