Imported Upstream version 0.11.94upstream/0.11.94

28 files changed, 292 insertions, 1926 deletions

diff --git a/ext/Makefile.am b/ext/Makefile.am
index ab2586b..bbdb9f0 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -1,4 +1 @@
-SUBDIRS = ffmpeg libswscale
-if !GST_LIBAV_ENABLE_LGPL
-    SUBDIRS += libpostproc
-endif
+SUBDIRS = libav libswscale
diff --git a/ext/Makefile.in b/ext/Makefile.in
index 673d7f5..382b8a4 100644
--- a/ext/Makefile.in
+++ b/ext/Makefile.in
@@ -51,7 +51,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-@GST_LIBAV_ENABLE_LGPL_FALSE@am__append_1 = libpostproc
 subdir = ext
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -110,7 +109,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 	distdir
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = ffmpeg libswscale libpostproc
+DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -262,8 +261,6 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PLUGINDIR = @PLUGINDIR@
-POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
-POSTPROC_LIBS = @POSTPROC_LIBS@
 PROFILE_CFLAGS = @PROFILE_CFLAGS@
 PYTHON = @PYTHON@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
@@ -347,7 +344,7 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = ffmpeg libswscale $(am__append_1)
+SUBDIRS = libav libswscale
 all: all-recursive
 
 .SUFFIXES:
diff --git a/ext/ffmpeg/Makefile.am b/ext/libav/Makefile.am
index ac4a7e8..a5928ac 100644
--- a/ext/ffmpeg/Makefile.am
+++ b/ext/libav/Makefile.am
@@ -6,22 +6,22 @@ else
     BZ2_LIBS =
 endif
 
-libgstlibav_la_SOURCES = gstffmpeg.c	\
-			  gstffmpegprotocol.c	\
-			  gstffmpegcodecmap.c	\
-			  gstffmpegutils.c	\
-			  gstffmpegenc.c	\
-			  gstffmpegvidenc.c	\
-			  gstffmpegdec.c	\
-			  gstffmpegviddec.c	\
-			  gstffmpegcfg.c	\
-			  gstffmpegdemux.c	\
-			  gstffmpegmux.c    \
-			  gstffmpegdeinterlace.c
+libgstlibav_la_SOURCES = gstav.c	\
+			  gstavprotocol.c	\
+			  gstavcodecmap.c	\
+			  gstavutils.c	\
+			  gstavenc.c	\
+			  gstavvidenc.c	\
+			  gstavdec.c	\
+			  gstavviddec.c	\
+			  gstavcfg.c	\
+			  gstavdemux.c	\
+			  gstavmux.c    \
+			  gstavdeinterlace.c
 #\
-#			  gstffmpegaudioresample.c
+#			  gstavaudioresample.c
 # 	\
-# 			  gstffmpegscale.c
+# 			  gstavscale.c
 
 libgstlibav_la_CFLAGS = $(LIBAV_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstlibav_la_LIBADD = $(LIBAV_LIBS) $(GST_PLUGINS_BASE_LIBS) \
@@ -37,10 +37,10 @@ endif
 
 
 noinst_HEADERS = \
-	gstffmpeg.h \
-	gstffmpegcodecmap.h \
-	gstffmpegutils.h \
-	gstffmpegenc.h \
-	gstffmpegvidenc.h \
-	gstffmpegcfg.h \
-	gstffmpegpipe.h
+	gstav.h \
+	gstavcodecmap.h \
+	gstavutils.h \
+	gstavenc.h \
+	gstavvidenc.h \
+	gstavcfg.h \
+	gstavpipe.h
diff --git a/ext/ffmpeg/Makefile.in b/ext/libav/Makefile.in
index 3918dcc..e468240 100644
--- a/ext/ffmpeg/Makefile.in
+++ b/ext/libav/Makefile.in
@@ -60,7 +60,7 @@ target_triplet = @target@
 @HAVE_LIBAV_UNINSTALLED_FALSE@	$(am__DEPENDENCIES_1) \
 @HAVE_LIBAV_UNINSTALLED_FALSE@	$(am__DEPENDENCIES_1) \
 @HAVE_LIBAV_UNINSTALLED_FALSE@	$(am__DEPENDENCIES_1)
-subdir = ext/ffmpeg
+subdir = ext/libav
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -122,18 +122,13 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(plugindir)"
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-am_libgstlibav_la_OBJECTS = libgstlibav_la-gstffmpeg.lo \
-	libgstlibav_la-gstffmpegprotocol.lo \
-	libgstlibav_la-gstffmpegcodecmap.lo \
-	libgstlibav_la-gstffmpegutils.lo \
-	libgstlibav_la-gstffmpegenc.lo \
-	libgstlibav_la-gstffmpegvidenc.lo \
-	libgstlibav_la-gstffmpegdec.lo \
-	libgstlibav_la-gstffmpegviddec.lo \
-	libgstlibav_la-gstffmpegcfg.lo \
-	libgstlibav_la-gstffmpegdemux.lo \
-	libgstlibav_la-gstffmpegmux.lo \
-	libgstlibav_la-gstffmpegdeinterlace.lo
+am_libgstlibav_la_OBJECTS = libgstlibav_la-gstav.lo \
+	libgstlibav_la-gstavprotocol.lo \
+	libgstlibav_la-gstavcodecmap.lo libgstlibav_la-gstavutils.lo \
+	libgstlibav_la-gstavenc.lo libgstlibav_la-gstavvidenc.lo \
+	libgstlibav_la-gstavdec.lo libgstlibav_la-gstavviddec.lo \
+	libgstlibav_la-gstavcfg.lo libgstlibav_la-gstavdemux.lo \
+	libgstlibav_la-gstavmux.lo libgstlibav_la-gstavdeinterlace.lo
 libgstlibav_la_OBJECTS = $(am_libgstlibav_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -304,8 +299,6 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PLUGINDIR = @PLUGINDIR@
-POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
-POSTPROC_LIBS = @POSTPROC_LIBS@
 PROFILE_CFLAGS = @PROFILE_CFLAGS@
 PYTHON = @PYTHON@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
@@ -392,23 +385,23 @@ top_srcdir = @top_srcdir@
 plugin_LTLIBRARIES = libgstlibav.la
 @HAVE_BZ2_FALSE@BZ2_LIBS = 
 @HAVE_BZ2_TRUE@BZ2_LIBS = -lbz2
-libgstlibav_la_SOURCES = gstffmpeg.c	\
-			  gstffmpegprotocol.c	\
-			  gstffmpegcodecmap.c	\
-			  gstffmpegutils.c	\
-			  gstffmpegenc.c	\
-			  gstffmpegvidenc.c	\
-			  gstffmpegdec.c	\
-			  gstffmpegviddec.c	\
-			  gstffmpegcfg.c	\
-			  gstffmpegdemux.c	\
-			  gstffmpegmux.c    \
-			  gstffmpegdeinterlace.c
+libgstlibav_la_SOURCES = gstav.c	\
+			  gstavprotocol.c	\
+			  gstavcodecmap.c	\
+			  gstavutils.c	\
+			  gstavenc.c	\
+			  gstavvidenc.c	\
+			  gstavdec.c	\
+			  gstavviddec.c	\
+			  gstavcfg.c	\
+			  gstavdemux.c	\
+			  gstavmux.c    \
+			  gstavdeinterlace.c
 
 #\
-#			  gstffmpegaudioresample.c
+#			  gstavaudioresample.c
 # 	\
-# 			  gstffmpegscale.c
+# 			  gstavscale.c
 libgstlibav_la_CFLAGS = $(LIBAV_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstlibav_la_LIBADD = $(LIBAV_LIBS) $(GST_PLUGINS_BASE_LIBS) \
 	-lgstaudio-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION) \
@@ -419,13 +412,13 @@ libgstlibav_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS)
 libgstlibav_la_LIBTOOLFLAGS = --tag=disable-static
 @HAVE_LIBAV_UNINSTALLED_TRUE@libgstlibav_la_DEPENDENCIES = $(LIBAV_LIBS)
 noinst_HEADERS = \
-	gstffmpeg.h \
-	gstffmpegcodecmap.h \
-	gstffmpegutils.h \
-	gstffmpegenc.h \
-	gstffmpegvidenc.h \
-	gstffmpegcfg.h \
-	gstffmpegpipe.h
+	gstav.h \
+	gstavcodecmap.h \
+	gstavutils.h \
+	gstavenc.h \
+	gstavvidenc.h \
+	gstavcfg.h \
+	gstavpipe.h
 
 all: all-am
 
@@ -440,9 +433,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ext/ffmpeg/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ext/libav/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu ext/ffmpeg/Makefile
+	  $(AUTOMAKE) --gnu ext/libav/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -502,18 +495,18 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlibav_la-gstffmpeg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlibav_la-gstffmpegcfg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlibav_la-gstffmpegcodecmap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlibav_la-gstffmpegdec.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlibav_la-gstffmpegdeinterlace.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlibav_la-gstffmpegdemux.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlibav_la-gstffmpegenc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlibav_la-gstffmpegmux.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlibav_la-gstffmpegprotocol.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlibav_la-gstffmpegutils.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlibav_la-gstffmpegviddec.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlibav_la-gstffmpegvidenc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlibav_la-gstav.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlibav_la-gstavcfg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlibav_la-gstavcodecmap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlibav_la-gstavdec.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlibav_la-gstavdeinterlace.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlibav_la-gstavdemux.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlibav_la-gstavenc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlibav_la-gstavmux.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlibav_la-gstavprotocol.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlibav_la-gstavutils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlibav_la-gstavviddec.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstlibav_la-gstavvidenc.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -536,89 +529,89 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-libgstlibav_la-gstffmpeg.lo: gstffmpeg.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -MT libgstlibav_la-gstffmpeg.lo -MD -MP -MF $(DEPDIR)/libgstlibav_la-gstffmpeg.Tpo -c -o libgstlibav_la-gstffmpeg.lo `test -f 'gstffmpeg.c' || echo '$(srcdir)/'`gstffmpeg.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibav_la-gstffmpeg.Tpo $(DEPDIR)/libgstlibav_la-gstffmpeg.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstffmpeg.c' object='libgstlibav_la-gstffmpeg.lo' libtool=yes @AMDEPBACKSLASH@
+libgstlibav_la-gstav.lo: gstav.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -MT libgstlibav_la-gstav.lo -MD -MP -MF $(DEPDIR)/libgstlibav_la-gstav.Tpo -c -o libgstlibav_la-gstav.lo `test -f 'gstav.c' || echo '$(srcdir)/'`gstav.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibav_la-gstav.Tpo $(DEPDIR)/libgstlibav_la-gstav.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstav.c' object='libgstlibav_la-gstav.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -c -o libgstlibav_la-gstffmpeg.lo `test -f 'gstffmpeg.c' || echo '$(srcdir)/'`gstffmpeg.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -c -o libgstlibav_la-gstav.lo `test -f 'gstav.c' || echo '$(srcdir)/'`gstav.c
 
-libgstlibav_la-gstffmpegprotocol.lo: gstffmpegprotocol.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -MT libgstlibav_la-gstffmpegprotocol.lo -MD -MP -MF $(DEPDIR)/libgstlibav_la-gstffmpegprotocol.Tpo -c -o libgstlibav_la-gstffmpegprotocol.lo `test -f 'gstffmpegprotocol.c' || echo '$(srcdir)/'`gstffmpegprotocol.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibav_la-gstffmpegprotocol.Tpo $(DEPDIR)/libgstlibav_la-gstffmpegprotocol.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstffmpegprotocol.c' object='libgstlibav_la-gstffmpegprotocol.lo' libtool=yes @AMDEPBACKSLASH@
+libgstlibav_la-gstavprotocol.lo: gstavprotocol.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -MT libgstlibav_la-gstavprotocol.lo -MD -MP -MF $(DEPDIR)/libgstlibav_la-gstavprotocol.Tpo -c -o libgstlibav_la-gstavprotocol.lo `test -f 'gstavprotocol.c' || echo '$(srcdir)/'`gstavprotocol.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibav_la-gstavprotocol.Tpo $(DEPDIR)/libgstlibav_la-gstavprotocol.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstavprotocol.c' object='libgstlibav_la-gstavprotocol.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -c -o libgstlibav_la-gstffmpegprotocol.lo `test -f 'gstffmpegprotocol.c' || echo '$(srcdir)/'`gstffmpegprotocol.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -c -o libgstlibav_la-gstavprotocol.lo `test -f 'gstavprotocol.c' || echo '$(srcdir)/'`gstavprotocol.c
 
-libgstlibav_la-gstffmpegcodecmap.lo: gstffmpegcodecmap.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -MT libgstlibav_la-gstffmpegcodecmap.lo -MD -MP -MF $(DEPDIR)/libgstlibav_la-gstffmpegcodecmap.Tpo -c -o libgstlibav_la-gstffmpegcodecmap.lo `test -f 'gstffmpegcodecmap.c' || echo '$(srcdir)/'`gstffmpegcodecmap.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibav_la-gstffmpegcodecmap.Tpo $(DEPDIR)/libgstlibav_la-gstffmpegcodecmap.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstffmpegcodecmap.c' object='libgstlibav_la-gstffmpegcodecmap.lo' libtool=yes @AMDEPBACKSLASH@
+libgstlibav_la-gstavcodecmap.lo: gstavcodecmap.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -MT libgstlibav_la-gstavcodecmap.lo -MD -MP -MF $(DEPDIR)/libgstlibav_la-gstavcodecmap.Tpo -c -o libgstlibav_la-gstavcodecmap.lo `test -f 'gstavcodecmap.c' || echo '$(srcdir)/'`gstavcodecmap.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibav_la-gstavcodecmap.Tpo $(DEPDIR)/libgstlibav_la-gstavcodecmap.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstavcodecmap.c' object='libgstlibav_la-gstavcodecmap.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -c -o libgstlibav_la-gstffmpegcodecmap.lo `test -f 'gstffmpegcodecmap.c' || echo '$(srcdir)/'`gstffmpegcodecmap.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -c -o libgstlibav_la-gstavcodecmap.lo `test -f 'gstavcodecmap.c' || echo '$(srcdir)/'`gstavcodecmap.c
 
-libgstlibav_la-gstffmpegutils.lo: gstffmpegutils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -MT libgstlibav_la-gstffmpegutils.lo -MD -MP -MF $(DEPDIR)/libgstlibav_la-gstffmpegutils.Tpo -c -o libgstlibav_la-gstffmpegutils.lo `test -f 'gstffmpegutils.c' || echo '$(srcdir)/'`gstffmpegutils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibav_la-gstffmpegutils.Tpo $(DEPDIR)/libgstlibav_la-gstffmpegutils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstffmpegutils.c' object='libgstlibav_la-gstffmpegutils.lo' libtool=yes @AMDEPBACKSLASH@
+libgstlibav_la-gstavutils.lo: gstavutils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -MT libgstlibav_la-gstavutils.lo -MD -MP -MF $(DEPDIR)/libgstlibav_la-gstavutils.Tpo -c -o libgstlibav_la-gstavutils.lo `test -f 'gstavutils.c' || echo '$(srcdir)/'`gstavutils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibav_la-gstavutils.Tpo $(DEPDIR)/libgstlibav_la-gstavutils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstavutils.c' object='libgstlibav_la-gstavutils.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -c -o libgstlibav_la-gstffmpegutils.lo `test -f 'gstffmpegutils.c' || echo '$(srcdir)/'`gstffmpegutils.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -c -o libgstlibav_la-gstavutils.lo `test -f 'gstavutils.c' || echo '$(srcdir)/'`gstavutils.c
 
-libgstlibav_la-gstffmpegenc.lo: gstffmpegenc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -MT libgstlibav_la-gstffmpegenc.lo -MD -MP -MF $(DEPDIR)/libgstlibav_la-gstffmpegenc.Tpo -c -o libgstlibav_la-gstffmpegenc.lo `test -f 'gstffmpegenc.c' || echo '$(srcdir)/'`gstffmpegenc.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibav_la-gstffmpegenc.Tpo $(DEPDIR)/libgstlibav_la-gstffmpegenc.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstffmpegenc.c' object='libgstlibav_la-gstffmpegenc.lo' libtool=yes @AMDEPBACKSLASH@
+libgstlibav_la-gstavenc.lo: gstavenc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -MT libgstlibav_la-gstavenc.lo -MD -MP -MF $(DEPDIR)/libgstlibav_la-gstavenc.Tpo -c -o libgstlibav_la-gstavenc.lo `test -f 'gstavenc.c' || echo '$(srcdir)/'`gstavenc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibav_la-gstavenc.Tpo $(DEPDIR)/libgstlibav_la-gstavenc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstavenc.c' object='libgstlibav_la-gstavenc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -c -o libgstlibav_la-gstffmpegenc.lo `test -f 'gstffmpegenc.c' || echo '$(srcdir)/'`gstffmpegenc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -c -o libgstlibav_la-gstavenc.lo `test -f 'gstavenc.c' || echo '$(srcdir)/'`gstavenc.c
 
-libgstlibav_la-gstffmpegvidenc.lo: gstffmpegvidenc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -MT libgstlibav_la-gstffmpegvidenc.lo -MD -MP -MF $(DEPDIR)/libgstlibav_la-gstffmpegvidenc.Tpo -c -o libgstlibav_la-gstffmpegvidenc.lo `test -f 'gstffmpegvidenc.c' || echo '$(srcdir)/'`gstffmpegvidenc.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibav_la-gstffmpegvidenc.Tpo $(DEPDIR)/libgstlibav_la-gstffmpegvidenc.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstffmpegvidenc.c' object='libgstlibav_la-gstffmpegvidenc.lo' libtool=yes @AMDEPBACKSLASH@
+libgstlibav_la-gstavvidenc.lo: gstavvidenc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -MT libgstlibav_la-gstavvidenc.lo -MD -MP -MF $(DEPDIR)/libgstlibav_la-gstavvidenc.Tpo -c -o libgstlibav_la-gstavvidenc.lo `test -f 'gstavvidenc.c' || echo '$(srcdir)/'`gstavvidenc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibav_la-gstavvidenc.Tpo $(DEPDIR)/libgstlibav_la-gstavvidenc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstavvidenc.c' object='libgstlibav_la-gstavvidenc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -c -o libgstlibav_la-gstffmpegvidenc.lo `test -f 'gstffmpegvidenc.c' || echo '$(srcdir)/'`gstffmpegvidenc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -c -o libgstlibav_la-gstavvidenc.lo `test -f 'gstavvidenc.c' || echo '$(srcdir)/'`gstavvidenc.c
 
-libgstlibav_la-gstffmpegdec.lo: gstffmpegdec.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -MT libgstlibav_la-gstffmpegdec.lo -MD -MP -MF $(DEPDIR)/libgstlibav_la-gstffmpegdec.Tpo -c -o libgstlibav_la-gstffmpegdec.lo `test -f 'gstffmpegdec.c' || echo '$(srcdir)/'`gstffmpegdec.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibav_la-gstffmpegdec.Tpo $(DEPDIR)/libgstlibav_la-gstffmpegdec.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstffmpegdec.c' object='libgstlibav_la-gstffmpegdec.lo' libtool=yes @AMDEPBACKSLASH@
+libgstlibav_la-gstavdec.lo: gstavdec.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -MT libgstlibav_la-gstavdec.lo -MD -MP -MF $(DEPDIR)/libgstlibav_la-gstavdec.Tpo -c -o libgstlibav_la-gstavdec.lo `test -f 'gstavdec.c' || echo '$(srcdir)/'`gstavdec.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibav_la-gstavdec.Tpo $(DEPDIR)/libgstlibav_la-gstavdec.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstavdec.c' object='libgstlibav_la-gstavdec.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -c -o libgstlibav_la-gstffmpegdec.lo `test -f 'gstffmpegdec.c' || echo '$(srcdir)/'`gstffmpegdec.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -c -o libgstlibav_la-gstavdec.lo `test -f 'gstavdec.c' || echo '$(srcdir)/'`gstavdec.c
 
-libgstlibav_la-gstffmpegviddec.lo: gstffmpegviddec.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -MT libgstlibav_la-gstffmpegviddec.lo -MD -MP -MF $(DEPDIR)/libgstlibav_la-gstffmpegviddec.Tpo -c -o libgstlibav_la-gstffmpegviddec.lo `test -f 'gstffmpegviddec.c' || echo '$(srcdir)/'`gstffmpegviddec.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibav_la-gstffmpegviddec.Tpo $(DEPDIR)/libgstlibav_la-gstffmpegviddec.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstffmpegviddec.c' object='libgstlibav_la-gstffmpegviddec.lo' libtool=yes @AMDEPBACKSLASH@
+libgstlibav_la-gstavviddec.lo: gstavviddec.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -MT libgstlibav_la-gstavviddec.lo -MD -MP -MF $(DEPDIR)/libgstlibav_la-gstavviddec.Tpo -c -o libgstlibav_la-gstavviddec.lo `test -f 'gstavviddec.c' || echo '$(srcdir)/'`gstavviddec.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibav_la-gstavviddec.Tpo $(DEPDIR)/libgstlibav_la-gstavviddec.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstavviddec.c' object='libgstlibav_la-gstavviddec.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -c -o libgstlibav_la-gstffmpegviddec.lo `test -f 'gstffmpegviddec.c' || echo '$(srcdir)/'`gstffmpegviddec.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -c -o libgstlibav_la-gstavviddec.lo `test -f 'gstavviddec.c' || echo '$(srcdir)/'`gstavviddec.c
 
-libgstlibav_la-gstffmpegcfg.lo: gstffmpegcfg.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -MT libgstlibav_la-gstffmpegcfg.lo -MD -MP -MF $(DEPDIR)/libgstlibav_la-gstffmpegcfg.Tpo -c -o libgstlibav_la-gstffmpegcfg.lo `test -f 'gstffmpegcfg.c' || echo '$(srcdir)/'`gstffmpegcfg.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibav_la-gstffmpegcfg.Tpo $(DEPDIR)/libgstlibav_la-gstffmpegcfg.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstffmpegcfg.c' object='libgstlibav_la-gstffmpegcfg.lo' libtool=yes @AMDEPBACKSLASH@
+libgstlibav_la-gstavcfg.lo: gstavcfg.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -MT libgstlibav_la-gstavcfg.lo -MD -MP -MF $(DEPDIR)/libgstlibav_la-gstavcfg.Tpo -c -o libgstlibav_la-gstavcfg.lo `test -f 'gstavcfg.c' || echo '$(srcdir)/'`gstavcfg.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibav_la-gstavcfg.Tpo $(DEPDIR)/libgstlibav_la-gstavcfg.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstavcfg.c' object='libgstlibav_la-gstavcfg.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -c -o libgstlibav_la-gstffmpegcfg.lo `test -f 'gstffmpegcfg.c' || echo '$(srcdir)/'`gstffmpegcfg.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -c -o libgstlibav_la-gstavcfg.lo `test -f 'gstavcfg.c' || echo '$(srcdir)/'`gstavcfg.c
 
-libgstlibav_la-gstffmpegdemux.lo: gstffmpegdemux.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -MT libgstlibav_la-gstffmpegdemux.lo -MD -MP -MF $(DEPDIR)/libgstlibav_la-gstffmpegdemux.Tpo -c -o libgstlibav_la-gstffmpegdemux.lo `test -f 'gstffmpegdemux.c' || echo '$(srcdir)/'`gstffmpegdemux.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibav_la-gstffmpegdemux.Tpo $(DEPDIR)/libgstlibav_la-gstffmpegdemux.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstffmpegdemux.c' object='libgstlibav_la-gstffmpegdemux.lo' libtool=yes @AMDEPBACKSLASH@
+libgstlibav_la-gstavdemux.lo: gstavdemux.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -MT libgstlibav_la-gstavdemux.lo -MD -MP -MF $(DEPDIR)/libgstlibav_la-gstavdemux.Tpo -c -o libgstlibav_la-gstavdemux.lo `test -f 'gstavdemux.c' || echo '$(srcdir)/'`gstavdemux.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibav_la-gstavdemux.Tpo $(DEPDIR)/libgstlibav_la-gstavdemux.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstavdemux.c' object='libgstlibav_la-gstavdemux.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -c -o libgstlibav_la-gstffmpegdemux.lo `test -f 'gstffmpegdemux.c' || echo '$(srcdir)/'`gstffmpegdemux.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -c -o libgstlibav_la-gstavdemux.lo `test -f 'gstavdemux.c' || echo '$(srcdir)/'`gstavdemux.c
 
-libgstlibav_la-gstffmpegmux.lo: gstffmpegmux.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -MT libgstlibav_la-gstffmpegmux.lo -MD -MP -MF $(DEPDIR)/libgstlibav_la-gstffmpegmux.Tpo -c -o libgstlibav_la-gstffmpegmux.lo `test -f 'gstffmpegmux.c' || echo '$(srcdir)/'`gstffmpegmux.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibav_la-gstffmpegmux.Tpo $(DEPDIR)/libgstlibav_la-gstffmpegmux.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstffmpegmux.c' object='libgstlibav_la-gstffmpegmux.lo' libtool=yes @AMDEPBACKSLASH@
+libgstlibav_la-gstavmux.lo: gstavmux.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -MT libgstlibav_la-gstavmux.lo -MD -MP -MF $(DEPDIR)/libgstlibav_la-gstavmux.Tpo -c -o libgstlibav_la-gstavmux.lo `test -f 'gstavmux.c' || echo '$(srcdir)/'`gstavmux.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibav_la-gstavmux.Tpo $(DEPDIR)/libgstlibav_la-gstavmux.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstavmux.c' object='libgstlibav_la-gstavmux.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -c -o libgstlibav_la-gstffmpegmux.lo `test -f 'gstffmpegmux.c' || echo '$(srcdir)/'`gstffmpegmux.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -c -o libgstlibav_la-gstavmux.lo `test -f 'gstavmux.c' || echo '$(srcdir)/'`gstavmux.c
 
-libgstlibav_la-gstffmpegdeinterlace.lo: gstffmpegdeinterlace.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -MT libgstlibav_la-gstffmpegdeinterlace.lo -MD -MP -MF $(DEPDIR)/libgstlibav_la-gstffmpegdeinterlace.Tpo -c -o libgstlibav_la-gstffmpegdeinterlace.lo `test -f 'gstffmpegdeinterlace.c' || echo '$(srcdir)/'`gstffmpegdeinterlace.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibav_la-gstffmpegdeinterlace.Tpo $(DEPDIR)/libgstlibav_la-gstffmpegdeinterlace.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstffmpegdeinterlace.c' object='libgstlibav_la-gstffmpegdeinterlace.lo' libtool=yes @AMDEPBACKSLASH@
+libgstlibav_la-gstavdeinterlace.lo: gstavdeinterlace.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -MT libgstlibav_la-gstavdeinterlace.lo -MD -MP -MF $(DEPDIR)/libgstlibav_la-gstavdeinterlace.Tpo -c -o libgstlibav_la-gstavdeinterlace.lo `test -f 'gstavdeinterlace.c' || echo '$(srcdir)/'`gstavdeinterlace.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstlibav_la-gstavdeinterlace.Tpo $(DEPDIR)/libgstlibav_la-gstavdeinterlace.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstavdeinterlace.c' object='libgstlibav_la-gstavdeinterlace.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -c -o libgstlibav_la-gstffmpegdeinterlace.lo `test -f 'gstffmpegdeinterlace.c' || echo '$(srcdir)/'`gstffmpegdeinterlace.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstlibav_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstlibav_la_CFLAGS) $(CFLAGS) -c -o libgstlibav_la-gstavdeinterlace.lo `test -f 'gstavdeinterlace.c' || echo '$(srcdir)/'`gstavdeinterlace.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
diff --git a/ext/ffmpeg/gstffmpeg.c b/ext/libav/gstav.c
index a0e79d0..8c88a13 100644
--- a/ext/ffmpeg/gstffmpeg.c
+++ b/ext/libav/gstav.c
@@ -27,16 +27,12 @@
 #include <stdio.h>
 #include <string.h>
 #include <gst/gst.h>
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <avcodec.h>
-#include <avformat.h>
-#else
+
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
-#endif
 
-#include "gstffmpeg.h"
-#include "gstffmpegutils.h"
+#include "gstav.h"
+#include "gstavutils.h"
 
 GST_DEBUG_CATEGORY (ffmpeg_debug);
 
diff --git a/ext/ffmpeg/gstffmpeg.h b/ext/libav/gstav.h
index 22ebc07..0ad05f3 100644
--- a/ext/ffmpeg/gstffmpeg.h
+++ b/ext/libav/gstav.h
@@ -24,13 +24,8 @@
 #ifndef __GST_FFMPEG_H__
 #define __GST_FFMPEG_H__
 
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <avcodec.h>
-#include <avformat.h>
-#else
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
-#endif
 
 #include <gst/gst.h>
 
diff --git a/ext/ffmpeg/gstffmpegcfg.c b/ext/libav/gstavcfg.c
index 99390be..5ee23dd 100644
--- a/ext/ffmpeg/gstffmpegcfg.c
+++ b/ext/libav/gstavcfg.c
@@ -25,9 +25,9 @@
 #include "config.h"
 #endif
 
-#include "gstffmpeg.h"
-#include "gstffmpegvidenc.h"
-#include "gstffmpegcfg.h"
+#include "gstav.h"
+#include "gstavvidenc.h"
+#include "gstavcfg.h"
 
 #include <string.h>
 
diff --git a/ext/ffmpeg/gstffmpegcfg.h b/ext/libav/gstavcfg.h
index 5251eb2..5251eb2 100644
--- a/ext/ffmpeg/gstffmpegcfg.h
+++ b/ext/libav/gstavcfg.h
diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/libav/gstavcodecmap.c
index 0df3c2d..2dd123a 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/libav/gstavcodecmap.c
@@ -22,16 +22,14 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
+#include <string.h>
+
 #include <gst/gst.h>
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <avcodec.h>
-#else
 #include <libavcodec/avcodec.h>
-#endif
-#include <string.h>
 
-#include "gstffmpeg.h"
-#include "gstffmpegcodecmap.h"
+#include "gstav.h"
+#include "gstavcodecmap.h"
 
 #include <gst/video/video.h>
 #include <gst/audio/audio.h>
@@ -1258,6 +1256,12 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
           NULL);
       break;
 
+    case CODEC_ID_PRORES:
+      caps =
+          gst_ff_vid_caps_new (context, codec_id, encode, "video/x-prores",
+          NULL);
+      break;
+
     case CODEC_ID_MIMIC:
       caps =
           gst_ff_vid_caps_new (context, codec_id, encode, "video/x-mimic",
@@ -1861,23 +1865,23 @@ gst_ffmpeg_pixfmt_to_caps (enum PixelFormat pix_fmt, AVCodecContext * context,
  */
 
 static GstCaps *
-gst_ffmpeg_smpfmt_to_caps (enum SampleFormat sample_fmt,
+gst_ffmpeg_smpfmt_to_caps (enum AVSampleFormat sample_fmt,
     AVCodecContext * context, enum CodecID codec_id)
 {
   GstCaps *caps = NULL;
   GstAudioFormat format;
 
   switch (sample_fmt) {
-    case SAMPLE_FMT_S16:
+    case AV_SAMPLE_FMT_S16:
       format = GST_AUDIO_FORMAT_S16;
       break;
-    case SAMPLE_FMT_S32:
+    case AV_SAMPLE_FMT_S32:
       format = GST_AUDIO_FORMAT_S32;
       break;
-    case SAMPLE_FMT_FLT:
+    case AV_SAMPLE_FMT_FLT:
       format = GST_AUDIO_FORMAT_F32;
       break;
-    case SAMPLE_FMT_DBL:
+    case AV_SAMPLE_FMT_DBL:
       format = GST_AUDIO_FORMAT_F64;
       break;
     default:
@@ -1926,12 +1930,12 @@ gst_ffmpeg_codectype_to_audio_caps (AVCodecContext * context,
     }
   } else {
     GstCaps *temp;
-    enum SampleFormat i;
+    enum AVSampleFormat i;
     AVCodecContext ctx = { 0, };
 
     ctx.channels = -1;
     caps = gst_caps_new_empty ();
-    for (i = 0; i <= SAMPLE_FMT_DBL; i++) {
+    for (i = 0; i <= AV_SAMPLE_FMT_DBL; i++) {
       temp = gst_ffmpeg_smpfmt_to_caps (i, encode ? &ctx : NULL, codec_id);
       if (temp != NULL) {
         gst_caps_append (caps, temp);
@@ -2034,16 +2038,16 @@ gst_ffmpeg_caps_to_smpfmt (const GstCaps * caps,
 
   switch (format) {
     case GST_AUDIO_FORMAT_F32:
-      context->sample_fmt = SAMPLE_FMT_FLT;
+      context->sample_fmt = AV_SAMPLE_FMT_FLT;
       break;
     case GST_AUDIO_FORMAT_F64:
-      context->sample_fmt = SAMPLE_FMT_DBL;
+      context->sample_fmt = AV_SAMPLE_FMT_DBL;
       break;
     case GST_AUDIO_FORMAT_S32:
-      context->sample_fmt = SAMPLE_FMT_S32;
+      context->sample_fmt = AV_SAMPLE_FMT_S32;
       break;
     case GST_AUDIO_FORMAT_S16:
-      context->sample_fmt = SAMPLE_FMT_S16;
+      context->sample_fmt = AV_SAMPLE_FMT_S16;
       break;
     default:
       break;
@@ -2241,6 +2245,8 @@ static const PixToFmt pixtofmttable[] = {
   /* GST_VIDEO_FORMAT_ARGB64, */
   /* GST_VIDEO_FORMAT_AYUV64, */
   /* GST_VIDEO_FORMAT_r210, */
+  {GST_VIDEO_FORMAT_I422_10LE, PIX_FMT_YUV422P10LE},
+  {GST_VIDEO_FORMAT_I422_10BE, PIX_FMT_YUV422P10BE},
 };
 
 GstVideoFormat
diff --git a/ext/ffmpeg/gstffmpegcodecmap.h b/ext/libav/gstavcodecmap.h
index 2039631..52e5bec 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.h
+++ b/ext/libav/gstavcodecmap.h
@@ -20,11 +20,7 @@
 #ifndef __GST_FFMPEG_CODECMAP_H__
 #define __GST_FFMPEG_CODECMAP_H__
 
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <avcodec.h>
-#else
 #include <libavcodec/avcodec.h>
-#endif
 #include <gst/gst.h>
 #include <gst/audio/audio.h>
 #include <gst/video/video.h>
diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/libav/gstavdec.c
index c9c8281..8291099 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/libav/gstavdec.c
@@ -24,17 +24,13 @@
 #include <assert.h>
 #include <string.h>
 
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <avcodec.h>
-#else
 #include <libavcodec/avcodec.h>
-#endif
 
 #include <gst/gst.h>
 
-#include "gstffmpeg.h"
-#include "gstffmpegcodecmap.h"
-#include "gstffmpegutils.h"
+#include "gstav.h"
+#include "gstavcodecmap.h"
+#include "gstavutils.h"
 
 GST_DEBUG_CATEGORY_EXTERN (GST_CAT_PERFORMANCE);
 
diff --git a/ext/ffmpeg/gstffmpegdeinterlace.c b/ext/libav/gstavdeinterlace.c
index 69e1724..65961f6 100644
--- a/ext/ffmpeg/gstffmpegdeinterlace.c
+++ b/ext/libav/gstavdeinterlace.c
@@ -24,18 +24,14 @@
 #  include "config.h"
 #endif
 
-#ifdef HAVE_LIBAV_UNINSTALLED
-#  include <avcodec.h>
-#else
-#  include <libavcodec/avcodec.h>
-#endif
+#include <libavcodec/avcodec.h>
 
 #include <gst/gst.h>
 #include <gst/video/video.h>
 
-#include "gstffmpeg.h"
-#include "gstffmpegcodecmap.h"
-#include "gstffmpegutils.h"
+#include "gstav.h"
+#include "gstavcodecmap.h"
+#include "gstavutils.h"
 
 
 /* Properties */
diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/libav/gstavdemux.c
index 6ed40bb..bbe5d8e 100644
--- a/ext/ffmpeg/gstffmpegdemux.c
+++ b/ext/libav/gstavdemux.c
@@ -24,23 +24,15 @@
 #endif
 
 #include <string.h>
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <avformat.h>
-#ifdef HAVE_AVI_H
-#include <avi.h>
-#endif
-#else
+
 #include <libavformat/avformat.h>
-#ifdef HAVE_AVI_H
-#include <ffmpeg/avi.h>
-#endif
-#endif
+/* #include <ffmpeg/avi.h> */
 #include <gst/gst.h>
 
-#include "gstffmpeg.h"
-#include "gstffmpegcodecmap.h"
-#include "gstffmpegutils.h"
-#include "gstffmpegpipe.h"
+#include "gstav.h"
+#include "gstavcodecmap.h"
+#include "gstavutils.h"
+#include "gstavpipe.h"
 
 #define MAX_STREAMS 20
 
@@ -285,8 +277,8 @@ gst_ffmpegdemux_init (GstFFMpegDemux * demux)
   gst_segment_init (&demux->segment, GST_FORMAT_TIME);
 
   /* push based data */
-  demux->ffpipe.tlock = g_mutex_new ();
-  demux->ffpipe.cond = g_cond_new ();
+  g_mutex_init (&demux->ffpipe.tlock);
+  g_cond_init (&demux->ffpipe.cond);
   demux->ffpipe.adapter = gst_adapter_new ();
 
   /* blacklist unreliable push-based demuxers */
@@ -303,8 +295,8 @@ gst_ffmpegdemux_finalize (GObject * object)
 
   demux = (GstFFMpegDemux *) object;
 
-  g_mutex_free (demux->ffpipe.tlock);
-  g_cond_free (demux->ffpipe.cond);
+  g_mutex_clear (&demux->ffpipe.tlock);
+  g_cond_clear (&demux->ffpipe.cond);
   gst_object_unref (demux->ffpipe.adapter);
 
   gst_object_unref (demux->task);
@@ -1710,7 +1702,8 @@ gst_ffmpegdemux_sink_activate (GstPad * sinkpad, GstObject * parent)
     goto activate_push;
   }
 
-  pull_mode = gst_query_has_scheduling_mode (query, GST_PAD_MODE_PULL);
+  pull_mode = gst_query_has_scheduling_mode_with_flags (query,
+      GST_PAD_MODE_PULL, GST_SCHEDULING_FLAG_SEEKABLE);
   gst_query_unref (query);
 
   if (!pull_mode)
@@ -1995,8 +1988,8 @@ gst_ffmpegdemux_register (GstPlugin * plugin)
       rank = GST_RANK_MARGINAL;
     else {
       GST_DEBUG ("ignoring %s", in_plugin->name);
-      rank = GST_RANK_MARGINAL;
-      //goto next;
+      rank = GST_RANK_NONE;
+      goto next;
     }
 
     p = name = g_strdup (in_plugin->name);
diff --git a/ext/ffmpeg/gstffmpegenc.c b/ext/libav/gstavenc.c
index be7bc41..312787e 100644
--- a/ext/ffmpeg/gstffmpegenc.c
+++ b/ext/libav/gstavenc.c
@@ -28,18 +28,14 @@
 #include <glib/gstdio.h>
 #include <errno.h>
 
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <avcodec.h>
-#else
 #include <libavcodec/avcodec.h>
-#endif
 
 #include <gst/gst.h>
 
-#include "gstffmpeg.h"
-#include "gstffmpegcodecmap.h"
-#include "gstffmpegutils.h"
-#include "gstffmpegenc.h"
+#include "gstav.h"
+#include "gstavcodecmap.h"
+#include "gstavutils.h"
+#include "gstavenc.h"
 
 #define DEFAULT_AUDIO_BITRATE 128000
 
@@ -249,9 +245,6 @@ gst_ffmpegaudenc_setcaps (GstFFMpegAudEnc * ffmpegaudenc, GstCaps * caps)
   if (ffmpegaudenc->opened) {
     gst_ffmpeg_avcodec_close (ffmpegaudenc->context);
     ffmpegaudenc->opened = FALSE;
-    /* fixed src caps;
-     * so clear src caps for proper (re-)negotiation */
-    gst_pad_set_caps (ffmpegaudenc->srcpad, NULL);
   }
 
   /* set defaults */
diff --git a/ext/ffmpeg/gstffmpegenc.h b/ext/libav/gstavenc.h
index 019b168..019b168 100644
--- a/ext/ffmpeg/gstffmpegenc.h
+++ b/ext/libav/gstavenc.h
diff --git a/ext/ffmpeg/gstffmpegmux.c b/ext/libav/gstavmux.c
index 41e6e3f..d9e8969 100644
--- a/ext/ffmpeg/gstffmpegmux.c
+++ b/ext/libav/gstavmux.c
@@ -22,18 +22,14 @@
 #endif
 
 #include <string.h>
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <avformat.h>
-#else
-#include <libavformat/avformat.h>
-#endif
 
+#include <libavformat/avformat.h>
 #include <gst/gst.h>
 #include <gst/base/gstcollectpads.h>
 
-#include "gstffmpeg.h"
-#include "gstffmpegcodecmap.h"
-#include "gstffmpegutils.h"
+#include "gstav.h"
+#include "gstavcodecmap.h"
+#include "gstavutils.h"
 
 typedef struct _GstFFMpegMux GstFFMpegMux;
 typedef struct _GstFFMpegMuxPad GstFFMpegMuxPad;
@@ -438,7 +434,7 @@ gst_ffmpegmux_request_new_pad (GstElement * element,
   pad = gst_pad_new_from_template (templ, padname);
   collect_pad = (GstFFMpegMuxPad *)
       gst_collect_pads_add_pad (ffmpegmux->collect, pad,
-      sizeof (GstFFMpegMuxPad));
+      sizeof (GstFFMpegMuxPad), NULL, TRUE);
   collect_pad->padnum = ffmpegmux->context->nb_streams;
 
   /* small hack to put our own event pad function and chain up to collect pad */
diff --git a/ext/ffmpeg/gstffmpegpipe.h b/ext/libav/gstavpipe.h
index a2515f3..09ec57d 100644
--- a/ext/ffmpeg/gstffmpegpipe.h
+++ b/ext/libav/gstavpipe.h
@@ -22,30 +22,30 @@
 #define __GST_FFMPEGPIPE_H__
 
 #include <gst/base/gstadapter.h>
-#include "gstffmpeg.h"
+#include "gstav.h"
 
 G_BEGIN_DECLS
 
 /* pipe protocol helpers */
 #define GST_FFMPEG_PIPE_MUTEX_LOCK(m) G_STMT_START {                    \
   GST_LOG_OBJECT (m, "locking tlock from thread %p", g_thread_self ()); \
-  g_mutex_lock (m->tlock);                                              \
+  g_mutex_lock (&m->tlock);                                              \
   GST_LOG_OBJECT (m, "locked tlock from thread %p", g_thread_self ());  \
 } G_STMT_END
 
 #define GST_FFMPEG_PIPE_MUTEX_UNLOCK(m) G_STMT_START {                    \
-  GST_LOG_OBJECT (m, "unlocking tlock from thread %p", g_thread_self ()); \
-  g_mutex_unlock (m->tlock);                                              \
+  GST_LOG_OBJECT (&m, "unlocking tlock from thread %p", g_thread_self ()); \
+  g_mutex_unlock (&m->tlock);                                              \
 } G_STMT_END
 
 #define GST_FFMPEG_PIPE_WAIT(m) G_STMT_START {                          \
   GST_LOG_OBJECT (m, "thread %p waiting", g_thread_self ());            \
-  g_cond_wait (m->cond, m->tlock);                                      \
+  g_cond_wait (&m->cond, &m->tlock);                                      \
 } G_STMT_END
 
 #define GST_FFMPEG_PIPE_SIGNAL(m) G_STMT_START {                        \
   GST_LOG_OBJECT (m, "signalling from thread %p", g_thread_self ());    \
-  g_cond_signal (m->cond);                                              \
+  g_cond_signal (&m->cond);                                              \
 } G_STMT_END
 
 typedef struct _GstFFMpegPipe GstFFMpegPipe;
@@ -53,10 +53,10 @@ typedef struct _GstFFMpegPipe GstFFMpegPipe;
 struct _GstFFMpegPipe
 {
   /* lock for syncing */
-  GMutex *tlock;
+  GMutex tlock;
   /* with TLOCK */
   /* signals counterpart thread to have a look */
-  GCond *cond;
+  GCond cond;
   /* seen eos */
   gboolean eos;
   /* flowreturn obtained by src task */
diff --git a/ext/ffmpeg/gstffmpegprotocol.c b/ext/libav/gstavprotocol.c
index fc2aa97..9c4b052 100644
--- a/ext/ffmpeg/gstffmpegprotocol.c
+++ b/ext/libav/gstavprotocol.c
@@ -23,16 +23,13 @@
 #endif
 #include <string.h>
 #include <errno.h>
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <avformat.h>
-#else
+
 #include <libavformat/avformat.h>
-#endif
 
 #include <gst/gst.h>
 
-#include "gstffmpeg.h"
-#include "gstffmpegpipe.h"
+#include "gstav.h"
+#include "gstavpipe.h"
 
 typedef struct _GstProtocolInfo GstProtocolInfo;
 
diff --git a/ext/ffmpeg/gstffmpegutils.c b/ext/libav/gstavutils.c
index 23e17ad..8555d8d 100644
--- a/ext/ffmpeg/gstffmpegutils.c
+++ b/ext/libav/gstavutils.c
@@ -20,7 +20,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "gstffmpegutils.h"
+#include "gstavutils.h"
 #include <unistd.h>
 #ifdef __APPLE__
 #include <sys/sysctl.h>
@@ -39,21 +39,21 @@ gst_ffmpeg_get_codecid_longname (enum CodecID codec_id)
 }
 
 gint
-av_smp_format_depth (enum SampleFormat smp_fmt)
+av_smp_format_depth (enum AVSampleFormat smp_fmt)
 {
   gint depth = -1;
   switch (smp_fmt) {
-    case SAMPLE_FMT_U8:
+    case AV_SAMPLE_FMT_U8:
       depth = 1;
       break;
-    case SAMPLE_FMT_S16:
+    case AV_SAMPLE_FMT_S16:
       depth = 2;
       break;
-    case SAMPLE_FMT_S32:
-    case SAMPLE_FMT_FLT:
+    case AV_SAMPLE_FMT_S32:
+    case AV_SAMPLE_FMT_FLT:
       depth = 4;
       break;
-    case SAMPLE_FMT_DBL:
+    case AV_SAMPLE_FMT_DBL:
       depth = 8;
       break;
     default:
diff --git a/ext/ffmpeg/gstffmpegutils.h b/ext/libav/gstavutils.h
index b517ca3..ebe49fb 100644
--- a/ext/ffmpeg/gstffmpegutils.h
+++ b/ext/libav/gstavutils.h
@@ -24,12 +24,8 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <mathematics.h>
-#include <avcodec.h>
-#else
 #include <libavcodec/avcodec.h>
-#endif
+#include <libavutil/mathematics.h>
 
 #include <gst/gst.h>
 
@@ -93,7 +89,7 @@ G_CONST_RETURN gchar *
 gst_ffmpeg_get_codecid_longname (enum CodecID codec_id);
 
 gint
-av_smp_format_depth(enum SampleFormat smp_fmt);
+av_smp_format_depth(enum AVSampleFormat smp_fmt);
 
 GstBuffer *
 new_aligned_buffer (gint size);
diff --git a/ext/ffmpeg/gstffmpegviddec.c b/ext/libav/gstavviddec.c
index 129fc89..588d2b2 100644
--- a/ext/ffmpeg/gstffmpegviddec.c
+++ b/ext/libav/gstavviddec.c
@@ -24,11 +24,7 @@
 #include <assert.h>
 #include <string.h>
 
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <avcodec.h>
-#else
 #include <libavcodec/avcodec.h>
-#endif
 
 #include <gst/gst.h>
 #include <gst/video/video.h>
@@ -36,9 +32,9 @@
 #include <gst/video/gstvideometa.h>
 #include <gst/video/gstvideopool.h>
 
-#include "gstffmpeg.h"
-#include "gstffmpegcodecmap.h"
-#include "gstffmpegutils.h"
+#include "gstav.h"
+#include "gstavcodecmap.h"
+#include "gstavutils.h"
 
 GST_DEBUG_CATEGORY_EXTERN (GST_CAT_PERFORMANCE);
 
@@ -69,9 +65,6 @@ struct _GstFFMpegVidDec
   gint ctx_time_n;
   gint ctx_interlaced;
 
-  /* for tracking DTS/PTS */
-  gboolean has_b_frames;
-
   guint8 *padded;
   guint padded_size;
 
@@ -155,6 +148,8 @@ static gboolean gst_ffmpegviddec_negotiate (GstFFMpegVidDec * ffmpegdec,
 /* some sort of bufferpool handling, but different */
 static int gst_ffmpegviddec_get_buffer (AVCodecContext * context,
     AVFrame * picture);
+static int gst_ffmpegviddec_reget_buffer (AVCodecContext * context,
+    AVFrame * picture);
 static void gst_ffmpegviddec_release_buffer (AVCodecContext * context,
     AVFrame * picture);
 
@@ -408,6 +403,7 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder,
 {
   GstFFMpegVidDec *ffmpegdec;
   GstFFMpegVidDecClass *oclass;
+  GstClockTime latency = GST_CLOCK_TIME_NONE;
   gboolean ret = FALSE;
 
   ffmpegdec = (GstFFMpegVidDec *) decoder;
@@ -441,11 +437,10 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder,
 
   /* set buffer functions */
   ffmpegdec->context->get_buffer = gst_ffmpegviddec_get_buffer;
+  ffmpegdec->context->reget_buffer = gst_ffmpegviddec_reget_buffer;
   ffmpegdec->context->release_buffer = gst_ffmpegviddec_release_buffer;
   ffmpegdec->context->draw_horiz_band = NULL;
 
-  ffmpegdec->has_b_frames = FALSE;
-
   GST_LOG_OBJECT (ffmpegdec, "size %dx%d", ffmpegdec->context->width,
       ffmpegdec->context->height);
 
@@ -495,11 +490,20 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder,
     gst_video_codec_state_unref (ffmpegdec->input_state);
   ffmpegdec->input_state = gst_video_codec_state_ref (state);
 
+  if (ffmpegdec->input_state->info.fps_n) {
+    GstVideoInfo *info = &ffmpegdec->input_state->info;
+    latency = gst_util_uint64_scale_ceil (
+        (ffmpegdec->context->has_b_frames) * GST_SECOND, info->fps_d,
+        info->fps_n);
+  }
+
   ret = TRUE;
 
 done:
   GST_OBJECT_UNLOCK (ffmpegdec);
 
+  gst_video_decoder_set_latency (decoder, latency, latency);
+
   return ret;
 
   /* ERRORS */
@@ -551,7 +555,7 @@ gst_ffmpegviddec_get_buffer (AVCodecContext * context, AVFrame * picture)
 
   ffmpegdec = (GstFFMpegVidDec *) context->opaque;
 
-  GST_DEBUG_OBJECT (ffmpegdec, "getting buffer");
+  GST_DEBUG_OBJECT (ffmpegdec, "getting buffer picture %p", picture);
 
   /* apply the last info we have seen to this picture, when we get the
    * picture back from ffmpeg we can use this to correctly timestamp the output
@@ -595,21 +599,18 @@ gst_ffmpegviddec_get_buffer (AVCodecContext * context, AVFrame * picture)
   for (c = 0; c < AV_NUM_DATA_POINTERS; c++) {
     if (c < GST_VIDEO_INFO_N_PLANES (info)) {
       picture->data[c] = GST_VIDEO_FRAME_PLANE_DATA (&dframe->vframe, c);
-      picture->linesize[c] = GST_VIDEO_FRAME_COMP_STRIDE (&dframe->vframe, c);
+      picture->linesize[c] = GST_VIDEO_FRAME_PLANE_STRIDE (&dframe->vframe, c);
     } else {
       picture->data[c] = NULL;
       picture->linesize[c] = 0;
     }
+    GST_LOG_OBJECT (ffmpegdec, "linesize %d, data %p", picture->linesize[c],
+        picture->data[c]);
   }
-  GST_DEBUG_OBJECT (ffmpegdec, "from GstVideoInfo data %p %p %p",
-      picture->data[0], picture->data[1], picture->data[2]);
-  GST_DEBUG_OBJECT (ffmpegdec, "from GstVideoInfo linesize %d %d %d",
-      picture->linesize[0], picture->linesize[1], picture->linesize[2]);
 
   /* tell ffmpeg we own this buffer, tranfer the ref we have on the buffer to
    * the opaque data. */
   picture->type = FF_BUFFER_TYPE_USER;
-  picture->age = 256 * 256 * 256 * 64;
 
   GST_LOG_OBJECT (ffmpegdec, "returned frame %p", frame->output_buffer);
 
@@ -650,8 +651,60 @@ duplicate_frame:
     return -1;
   }
 no_frame:
-  GST_WARNING_OBJECT (ffmpegdec, "Couldn't get codec frame !");
-  return -1;
+  {
+    GST_WARNING_OBJECT (ffmpegdec, "Couldn't get codec frame !");
+    return -1;
+  }
+}
+
+static int
+gst_ffmpegviddec_reget_buffer (AVCodecContext * context, AVFrame * picture)
+{
+  GstVideoCodecFrame *frame;
+  GstFFMpegVidDecVideoFrame *dframe;
+  GstFFMpegVidDec *ffmpegdec;
+
+  ffmpegdec = (GstFFMpegVidDec *) context->opaque;
+
+  GST_DEBUG_OBJECT (ffmpegdec, "regetting buffer picture %p", picture);
+
+  picture->reordered_opaque = context->reordered_opaque;
+
+  /* if there is no opaque, we didn't yet attach any frame to it. What usually
+   * happens is that avcodec_default_reget_buffer will call the getbuffer
+   * function. */
+  dframe = picture->opaque;
+  if (dframe == NULL)
+    goto done;
+
+  frame =
+      gst_video_decoder_get_frame (GST_VIDEO_DECODER (ffmpegdec),
+      picture->reordered_opaque);
+  if (G_UNLIKELY (frame == NULL))
+    goto no_frame;
+
+  if (G_UNLIKELY (frame->output_buffer != NULL))
+    goto duplicate_frame;
+
+  /* replace the frame, this one contains the pts/dts for the correspoding input
+   * buffer, which we need after decoding. */
+  gst_video_codec_frame_unref (dframe->frame);
+  dframe->frame = frame;
+
+done:
+  return avcodec_default_reget_buffer (context, picture);
+
+  /* ERRORS */
+no_frame:
+  {
+    GST_WARNING_OBJECT (ffmpegdec, "Couldn't get codec frame !");
+    return -1;
+  }
+duplicate_frame:
+  {
+    GST_WARNING_OBJECT (ffmpegdec, "already alloc'ed output buffer for frame");
+    return -1;
+  }
 }
 
 /* called when ffmpeg is done with our buffer */
@@ -956,23 +1009,19 @@ get_output_buffer (GstFFMpegVidDec * ffmpegdec, GstVideoCodecFrame * frame)
     goto alloc_failed;
 
   for (c = 0; c < AV_NUM_DATA_POINTERS; c++) {
-    if (c < GST_VIDEO_INFO_N_COMPONENTS (info)) {
+    if (c < GST_VIDEO_INFO_N_PLANES (info)) {
       pic.data[c] = GST_VIDEO_FRAME_PLANE_DATA (&vframe, c);
-      pic.linesize[c] = GST_VIDEO_FRAME_COMP_STRIDE (&vframe, c);
+      pic.linesize[c] = GST_VIDEO_FRAME_PLANE_STRIDE (&vframe, c);
     } else {
       pic.data[c] = NULL;
       pic.linesize[c] = 0;
     }
+    GST_LOG_OBJECT (ffmpegdec, "linesize %d, data %p", pic.linesize[c],
+        pic.data[c]);
   }
 
   outpic = (AVPicture *) ffmpegdec->picture;
 
-  GST_LOG_OBJECT (ffmpegdec, "linsize %d %d %d", outpic->linesize[0],
-      outpic->linesize[1], outpic->linesize[2]);
-  GST_LOG_OBJECT (ffmpegdec, "data %u %u %u", 0,
-      (guint) (outpic->data[1] - outpic->data[0]),
-      (guint) (outpic->data[2] - outpic->data[0]));
-
   av_picture_copy (&pic, outpic, ffmpegdec->context->pix_fmt,
       GST_VIDEO_INFO_WIDTH (info), GST_VIDEO_INFO_HEIGHT (info));
 
@@ -1688,6 +1737,7 @@ gst_ffmpegviddec_register (GstPlugin * plugin)
     if (!strcmp (in_plugin->name, "gif") ||
         !strcmp (in_plugin->name, "theora") ||
         !strcmp (in_plugin->name, "mpeg1video") ||
+        strstr (in_plugin->name, "crystalhd") != NULL ||
         !strcmp (in_plugin->name, "ass") ||
         !strcmp (in_plugin->name, "srt") ||
         !strcmp (in_plugin->name, "pgssub") ||
diff --git a/ext/ffmpeg/gstffmpegvidenc.c b/ext/libav/gstavvidenc.c
index 4204e08..2ef4acb 100644
--- a/ext/ffmpeg/gstffmpegvidenc.c
+++ b/ext/libav/gstavvidenc.c
@@ -28,20 +28,16 @@
 #include <glib/gstdio.h>
 #include <errno.h>
 
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <avcodec.h>
-#else
 #include <libavcodec/avcodec.h>
-#endif
 
 #include <gst/gst.h>
 #include <gst/video/gstvideometa.h>
 
-#include "gstffmpeg.h"
-#include "gstffmpegcodecmap.h"
-#include "gstffmpegutils.h"
-#include "gstffmpegvidenc.h"
-#include "gstffmpegcfg.h"
+#include "gstav.h"
+#include "gstavcodecmap.h"
+#include "gstavutils.h"
+#include "gstavvidenc.h"
+#include "gstavcfg.h"
 
 #define DEFAULT_VIDEO_BITRATE 300000    /* in bps */
 #define DEFAULT_VIDEO_GOP_SIZE 15
@@ -666,7 +662,7 @@ gst_ffmpegvidenc_handle_frame (GstVideoEncoder * encoder,
   GstVideoFrame vframe;
 
   if (GST_VIDEO_CODEC_FRAME_IS_FORCE_KEYFRAME (frame))
-    ffmpegenc->picture->pict_type = FF_I_TYPE;
+    ffmpegenc->picture->pict_type = AV_PICTURE_TYPE_I;
 
   if (!gst_video_frame_map (&vframe, info, frame->input_buffer, GST_MAP_READ)) {
     GST_ERROR_OBJECT (encoder, "Failed to map input buffer");
diff --git a/ext/ffmpeg/gstffmpegvidenc.h b/ext/libav/gstavvidenc.h
index eb201b3..eb201b3 100644
--- a/ext/ffmpeg/gstffmpegvidenc.h
+++ b/ext/libav/gstavvidenc.h
diff --git a/ext/libpostproc/Makefile.am b/ext/libpostproc/Makefile.am
deleted file mode 100644
index 0385e44..0000000
--- a/ext/libpostproc/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-plugin_LTLIBRARIES = libgstpostproc.la
-
-libgstpostproc_la_SOURCES = gstpostproc.c
-
-libgstpostproc_la_CFLAGS = $(POSTPROC_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS)
-libgstpostproc_la_LIBADD = -lgstvideo-@GST_API_VERSION@ \
-	$(POSTPROC_LIBS) \
-	$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(ORC_LIBS)
-
-libgstpostproc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS)
-libgstpostproc_la_LIBTOOLFLAGS = --tag=disable-static
-
diff --git a/ext/libpostproc/Makefile.in b/ext/libpostproc/Makefile.in
deleted file mode 100644
index 3330889..0000000
--- a/ext/libpostproc/Makefile.in
+++ /dev/null
@@ -1,703 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = ext/libpostproc
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \
-	$(top_srcdir)/common/m4/as-auto-alt.m4 \
-	$(top_srcdir)/common/m4/as-compiler-flag.m4 \
-	$(top_srcdir)/common/m4/as-docbook.m4 \
-	$(top_srcdir)/common/m4/as-libtool.m4 \
-	$(top_srcdir)/common/m4/as-python.m4 \
-	$(top_srcdir)/common/m4/as-version.m4 \
-	$(top_srcdir)/common/m4/gst-arch.m4 \
-	$(top_srcdir)/common/m4/gst-args.m4 \
-	$(top_srcdir)/common/m4/gst-check.m4 \
-	$(top_srcdir)/common/m4/gst-doc.m4 \
-	$(top_srcdir)/common/m4/gst-error.m4 \
-	$(top_srcdir)/common/m4/gst-feature.m4 \
-	$(top_srcdir)/common/m4/gst-platform.m4 \
-	$(top_srcdir)/common/m4/gst-plugin-docs.m4 \
-	$(top_srcdir)/common/m4/gst-plugindir.m4 \
-	$(top_srcdir)/common/m4/gst.m4 \
-	$(top_srcdir)/common/m4/gtk-doc.m4 \
-	$(top_srcdir)/common/m4/orc.m4 $(top_srcdir)/common/m4/pkg.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(plugindir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libgstpostproc_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
-am_libgstpostproc_la_OBJECTS = libgstpostproc_la-gstpostproc.lo
-libgstpostproc_la_OBJECTS = $(am_libgstpostproc_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-libgstpostproc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(libgstpostproc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(CCLD) $(libgstpostproc_la_CFLAGS) $(CFLAGS) \
-	$(libgstpostproc_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libgstpostproc_la_SOURCES)
-DIST_SOURCES = $(libgstpostproc_la_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CAT_ENTRY_END = @CAT_ENTRY_END@
-CAT_ENTRY_START = @CAT_ENTRY_START@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DARWIN_LDFLAGS = @DARWIN_LDFLAGS@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPRECATED_CFLAGS = @DEPRECATED_CFLAGS@
-DLLTOOL = @DLLTOOL@
-DOCBOOK_ROOT = @DOCBOOK_ROOT@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ERROR_CFLAGS = @ERROR_CFLAGS@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-GSTPB_PLUGINS_DIR = @GSTPB_PLUGINS_DIR@
-GST_AGE = @GST_AGE@
-GST_ALL_LDFLAGS = @GST_ALL_LDFLAGS@
-GST_API_VERSION = @GST_API_VERSION@
-GST_BASE_CFLAGS = @GST_BASE_CFLAGS@
-GST_BASE_LIBS = @GST_BASE_LIBS@
-GST_CFLAGS = @GST_CFLAGS@
-GST_CHECK_CFLAGS = @GST_CHECK_CFLAGS@
-GST_CHECK_LIBS = @GST_CHECK_LIBS@
-GST_CURRENT = @GST_CURRENT@
-GST_LEVEL_DEFAULT = @GST_LEVEL_DEFAULT@
-GST_LIBS = @GST_LIBS@
-GST_LIBVERSION = @GST_LIBVERSION@
-GST_LT_LDFLAGS = @GST_LT_LDFLAGS@
-GST_OPTION_CFLAGS = @GST_OPTION_CFLAGS@
-GST_PACKAGE_NAME = @GST_PACKAGE_NAME@
-GST_PACKAGE_ORIGIN = @GST_PACKAGE_ORIGIN@
-GST_PLUGINS_BASE_CFLAGS = @GST_PLUGINS_BASE_CFLAGS@
-GST_PLUGINS_BASE_DIR = @GST_PLUGINS_BASE_DIR@
-GST_PLUGINS_BASE_LIBS = @GST_PLUGINS_BASE_LIBS@
-GST_PLUGINS_DIR = @GST_PLUGINS_DIR@
-GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
-GST_REVISION = @GST_REVISION@
-GST_TOOLS_DIR = @GST_TOOLS_DIR@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-HAVE_BZ2 = @HAVE_BZ2@
-HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@
-HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@
-HAVE_DVIPS = @HAVE_DVIPS@
-HAVE_EPSTOPDF = @HAVE_EPSTOPDF@
-HAVE_FIG2DEV = @HAVE_FIG2DEV@
-HAVE_JADETEX = @HAVE_JADETEX@
-HAVE_PNGTOPNM = @HAVE_PNGTOPNM@
-HAVE_PNMTOPS = @HAVE_PNMTOPS@
-HAVE_PS2PDF = @HAVE_PS2PDF@
-HAVE_XMLLINT = @HAVE_XMLLINT@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBAV_CFLAGS = @LIBAV_CFLAGS@
-LIBAV_CO_DIR = @LIBAV_CO_DIR@
-LIBAV_EXTERNALS_REVISION = @LIBAV_EXTERNALS_REVISION@
-LIBAV_LIBS = @LIBAV_LIBS@
-LIBAV_REVISION = @LIBAV_REVISION@
-LIBAV_SUBDIRS = @LIBAV_SUBDIRS@
-LIBAV_SVN = @LIBAV_SVN@
-LIBM = @LIBM@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-ORCC = @ORCC@
-ORCC_FLAGS = @ORCC_FLAGS@
-ORC_CFLAGS = @ORC_CFLAGS@
-ORC_LIBS = @ORC_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@
-PACKAGE_VERSION_MICRO = @PACKAGE_VERSION_MICRO@
-PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@
-PACKAGE_VERSION_NANO = @PACKAGE_VERSION_NANO@
-PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PLUGINDIR = @PLUGINDIR@
-POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
-POSTPROC_LIBS = @POSTPROC_LIBS@
-PROFILE_CFLAGS = @PROFILE_CFLAGS@
-PYTHON = @PYTHON@
-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_VERSION = @PYTHON_VERSION@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWSCALE_CFLAGS = @SWSCALE_CFLAGS@
-SWSCALE_LIBS = @SWSCALE_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VALGRIND_PATH = @VALGRIND_PATH@
-VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WIN32_LIBS = @WIN32_LIBS@
-XML_CATALOG = @XML_CATALOG@
-XSLTPROC = @XSLTPROC@
-XSLTPROC_FLAGS = @XSLTPROC_FLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgpyexecdir = @pkgpyexecdir@
-pkgpythondir = @pkgpythondir@
-plugindir = @plugindir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pyexecdir = @pyexecdir@
-pythondir = @pythondir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugin_LTLIBRARIES = libgstpostproc.la
-libgstpostproc_la_SOURCES = gstpostproc.c
-libgstpostproc_la_CFLAGS = $(POSTPROC_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS)
-libgstpostproc_la_LIBADD = -lgstvideo-@GST_API_VERSION@ \
-	$(POSTPROC_LIBS) \
-	$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(ORC_LIBS)
-
-libgstpostproc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS)
-libgstpostproc_la_LIBTOOLFLAGS = --tag=disable-static
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ext/libpostproc/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu ext/libpostproc/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libgstpostproc.la: $(libgstpostproc_la_OBJECTS) $(libgstpostproc_la_DEPENDENCIES) $(EXTRA_libgstpostproc_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(libgstpostproc_la_LINK) -rpath $(plugindir) $(libgstpostproc_la_OBJECTS) $(libgstpostproc_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstpostproc_la-gstpostproc.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-libgstpostproc_la-gstpostproc.lo: gstpostproc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstpostproc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstpostproc_la_CFLAGS) $(CFLAGS) -MT libgstpostproc_la-gstpostproc.lo -MD -MP -MF $(DEPDIR)/libgstpostproc_la-gstpostproc.Tpo -c -o libgstpostproc_la-gstpostproc.lo `test -f 'gstpostproc.c' || echo '$(srcdir)/'`gstpostproc.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstpostproc_la-gstpostproc.Tpo $(DEPDIR)/libgstpostproc_la-gstpostproc.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstpostproc.c' object='libgstpostproc_la-gstpostproc.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgstpostproc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstpostproc_la_CFLAGS) $(CFLAGS) -c -o libgstpostproc_la-gstpostproc.lo `test -f 'gstpostproc.c' || echo '$(srcdir)/'`gstpostproc.c
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/ext/libpostproc/gstpostproc.c b/ext/libpostproc/gstpostproc.c
deleted file mode 100644
index 8f9bb91..0000000
--- a/ext/libpostproc/gstpostproc.c
+++ /dev/null
@@ -1,906 +0,0 @@
-/*
-    Copyright (C) 2005 Edward Hervey (edward@fluendo.com)
-    Copyright (C) 2006 Mark Nauwelaerts (manauw@skynet.be)
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <gst/gst.h>
-#include <gst/video/video.h>
-#include <gst/video/gstvideofilter.h>
-
-#ifdef HAVE_ORC
-#include <orc/orc.h>
-#endif
-
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <avcodec.h>
-#include <postprocess.h>
-#else
-#include <libavcodec/avcodec.h>
-#include <libpostproc/postprocess.h>
-#endif
-
-
-typedef struct _PostProcDetails PostProcDetails;
-
-struct _PostProcDetails
-{
-  const char *shortname;
-  const char *longname;
-  const char *description;
-};
-
-static const PostProcDetails filterdetails[] = {
-  {"hb", "hdeblock", "horizontal deblocking filter"},
-  {"vb", "vdeblock", "vertical deblocking filter"},
-  {"h1", "x1hdeblock", "experimental horizontal deblocking filter 1"},
-  {"v1", "x1vdeblock", "experimental vertical deblocking filter 1"},
-  {"ha", "ahdeblock", "another horizontal deblocking filter"},
-  {"va", "avdeblock", "another vertical deblocking filter"},
-  {"dr", "dering", "deringing filter"},
-  {"al", "autolevels", "automatic brightness/contrast filter"},
-  {"lb", "linblenddeint", "linear blend interpolater"},
-  {"li", "linipoldeint", "linear interpolation deinterlacer"},
-  {"ci", "cubicipoldeint", "cubic interpolation deinterlacer"},
-  {"md", "mediandeint", "median deinterlacer"},
-  {"fd", "ffmpegdeint", "ffmpeg deinterlacer"},
-  {"l5", "lowpass5", "FIR lowpass deinterlacer"},
-  {"tn", "tmpnoise", "temporal noise reducer"},
-  {"fq", "forcequant", "force quantizer"},
-  {"de", "default", "default filters"},
-  {NULL, NULL, NULL}
-};
-
-typedef struct _GstPostProc GstPostProc;
-
-struct _GstPostProc
-{
-  GstVideoFilter element;
-
-  GstPad *sinkpad, *srcpad;
-  guint quality;
-  gint width, height;
-
-  pp_mode *mode;
-  pp_context *context;
-
-  /* props of various filters */
-  gboolean autoq;
-  guint scope;
-  /* though not all needed at once,
-   * this avoids union or ugly re-use for simplicity */
-  gint diff, flat;
-  gint t1, t2, t3;
-  gboolean range;
-  gint quant;
-
-  /* argument string for pp */
-  gchar *cargs, *args;
-};
-
-typedef struct _GstPostProcClass GstPostProcClass;
-
-struct _GstPostProcClass
-{
-  GstVideoFilterClass parent_class;
-
-  gint filterid;
-};
-
-/* properties for the various pp filters */
-/* common props */
-enum
-{
-  PROP_0,
-  PROP_QUALITY,
-  PROP_AUTOQ,
-  PROP_SCOPE,
-  PROP_MAX
-};
-
-/* possible filter scopes */
-enum
-{
-  SCOPE_BOTH,
-  SCOPE_CHROMA,
-  SCOPE_LUMA
-};
-
-#define DEFAULT_QUALITY   PP_QUALITY_MAX
-#define DEFAULT_AUTOQ     FALSE
-#define DEFAULT_SCOPE     SCOPE_BOTH
-
-/* deblocking props */
-enum
-{
-  PROP_DIFF = PROP_MAX,
-  PROP_FLAT
-};
-
-#define DEFAULT_DIFF    -1
-#define DEFAULT_FLAT    -1
-
-/* denoise props */
-enum
-{
-  PROP_T1 = PROP_MAX,
-  PROP_T2,
-  PROP_T3
-};
-
-#define DEFAULT_T1    -1
-#define DEFAULT_T2    -1
-#define DEFAULT_T3    -1
-
-/* autolevels */
-enum
-{
-  PROP_RANGE = PROP_MAX
-};
-
-#define DEFAULT_RANGE FALSE
-
-/* forceq props */
-enum
-{
-  PROP_QUANT = PROP_MAX
-};
-
-#define DEFAULT_QUANT  -1
-
-
-/* hashtable, key = gtype, value = filterdetails index */
-static GHashTable *global_plugins;
-
-/* TODO : add support for the other format supported by libpostproc */
-
-static GstStaticPadTemplate gst_post_proc_src_template =
-GST_STATIC_PAD_TEMPLATE ("src",
-    GST_PAD_SRC,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE ("{ IYUV, I420, YV12, Y42B, Y41B }"))
-    );
-
-static GstStaticPadTemplate gst_post_proc_sink_template =
-GST_STATIC_PAD_TEMPLATE ("sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE ("{ IYUV, I420, YV12, Y42B, Y41B }"))
-    );
-
-GST_DEBUG_CATEGORY (postproc_debug);
-#define GST_CAT_DEFAULT postproc_debug
-
-static void gst_post_proc_class_init (GstPostProcClass * klass);
-static void gst_post_proc_base_init (GstPostProcClass * klass);
-static void gst_post_proc_init (GstPostProc * pproc);
-static void gst_post_proc_dispose (GObject * object);
-
-static gboolean gst_post_proc_set_info (GstVideoFilter * vfilter,
-    GstCaps * incaps, GstVideoInfo * in_info, GstCaps * outcaps,
-    GstVideoInfo * out_info);
-static GstFlowReturn gst_post_proc_transform_frame_ip (GstVideoFilter * vfilter,
-    GstVideoFrame * frame);
-
-/* static GstStateChangeReturn gst_post_proc_change_state (GstElement * element, */
-/*     GstStateChange transition); */
-
-static void gst_post_proc_set_property (GObject * object,
-    guint prop_id, const GValue * value, GParamSpec * pspec);
-static void gst_post_proc_get_property (GObject * object,
-    guint prop_id, GValue * value, GParamSpec * pspec);
-static void gst_post_proc_deblock_set_property (GObject * object,
-    guint prop_id, const GValue * value, GParamSpec * pspec);
-static void gst_post_proc_deblock_get_property (GObject * object,
-    guint prop_id, GValue * value, GParamSpec * pspec);
-static void gst_post_proc_autolevels_set_property (GObject * object,
-    guint prop_id, const GValue * value, GParamSpec * pspec);
-static void gst_post_proc_autolevels_get_property (GObject * object,
-    guint prop_id, GValue * value, GParamSpec * pspec);
-static void gst_post_proc_tmpnoise_set_property (GObject * object,
-    guint prop_id, const GValue * value, GParamSpec * pspec);
-static void gst_post_proc_tmpnoise_get_property (GObject * object,
-    guint prop_id, GValue * value, GParamSpec * pspec);
-static void gst_post_proc_forcequant_set_property (GObject * object,
-    guint prop_id, const GValue * value, GParamSpec * pspec);
-static void gst_post_proc_forcequant_get_property (GObject * object,
-    guint prop_id, GValue * value, GParamSpec * pspec);
-
-static GstElementClass *parent_class = NULL;
-
-#define GST_TYPE_PP_SCOPE (gst_pp_scope_get_type())
-static GType
-gst_pp_scope_get_type (void)
-{
-  static GType pp_scope_type = 0;
-
-  static const GEnumValue pp_scope[] = {
-    {0, "Chrominance and Luminance filtering", "both"},
-    {1, "Chrominance only filtering", "chroma"},
-    {2, "Luminance only filtering", "luma"},
-    {0, NULL, NULL},
-  };
-
-  if (!pp_scope_type) {
-    pp_scope_type = g_enum_register_static ("GstPostProcPPScope", pp_scope);
-  }
-  return pp_scope_type;
-}
-
-#ifndef GST_DISABLE_GST_DEBUG
-static void
-gst_ffmpeg_log_callback (void *ptr, int level, const char *fmt, va_list vl)
-{
-  GstDebugLevel gst_level;
-
-  switch (level) {
-    case AV_LOG_QUIET:
-      gst_level = GST_LEVEL_NONE;
-      break;
-    case AV_LOG_ERROR:
-      gst_level = GST_LEVEL_ERROR;
-      break;
-    case AV_LOG_INFO:
-      gst_level = GST_LEVEL_INFO;
-      break;
-    case AV_LOG_DEBUG:
-      gst_level = GST_LEVEL_DEBUG;
-      break;
-    default:
-      gst_level = GST_LEVEL_INFO;
-      break;
-  }
-
-  gst_debug_log_valist (postproc_debug, gst_level, "", "", 0, NULL, fmt, vl);
-}
-#endif
-
-#define ROUND_UP_2(x)  (((x)+1)&~1)
-#define ROUND_UP_4(x)  (((x)+3)&~3)
-#define ROUND_UP_8(x)  (((x)+7)&~7)
-
-static void
-change_context (GstPostProc * postproc, gint width, gint height)
-{
-#ifdef HAVE_ORC
-  guint mmx_flags;
-  guint altivec_flags;
-#endif
-  gint ppflags;
-
-  GST_DEBUG_OBJECT (postproc, "change_context, width:%d, height:%d",
-      width, height);
-
-  if ((width != postproc->width) && (height != postproc->height)) {
-    if (postproc->context)
-      pp_free_context (postproc->context);
-
-#ifdef HAVE_ORC
-    mmx_flags = orc_target_get_default_flags (orc_target_get_by_name ("mmx"));
-    altivec_flags =
-        orc_target_get_default_flags (orc_target_get_by_name ("altivec"));
-    ppflags = (mmx_flags & ORC_TARGET_MMX_MMX ? PP_CPU_CAPS_MMX : 0)
-        | (mmx_flags & ORC_TARGET_MMX_MMXEXT ? PP_CPU_CAPS_MMX2 : 0)
-        | (mmx_flags & ORC_TARGET_MMX_3DNOW ? PP_CPU_CAPS_3DNOW : 0)
-        | (altivec_flags & ORC_TARGET_ALTIVEC_ALTIVEC ? PP_CPU_CAPS_ALTIVEC :
-        0);
-#else
-    ppflags = 0;
-#endif
-
-    postproc->context = pp_get_context (width, height, PP_FORMAT_420 | ppflags);
-    postproc->width = width;
-    postproc->height = height;
-  }
-}
-
-/* append app to *base, and places result in *base */
-/* all input strings are free'd */
-static void inline
-append (gchar ** base, gchar * app)
-{
-  gchar *res;
-  const gchar *sep;
-
-  if (**base && *app)
-    sep = ":";
-  else
-    sep = "";
-  res = g_strconcat (*base, sep, app, NULL);
-  g_free (*base);
-  g_free (app);
-  *base = res;
-}
-
-static void
-change_mode (GstPostProc * postproc)
-{
-  GstPostProcClass *klass;
-  gchar *name;
-
-  klass = (GstPostProcClass *) G_OBJECT_GET_CLASS (G_OBJECT (postproc));
-
-  if (postproc->mode)
-    pp_free_mode (postproc->mode);
-
-  name = g_strdup (filterdetails[klass->filterid].shortname);
-  append (&name, g_strdup (postproc->cargs));
-  append (&name, g_strdup (postproc->args));
-  GST_DEBUG_OBJECT (postproc, "requesting pp %s", name);
-  postproc->mode = pp_get_mode_by_name_and_quality (name, postproc->quality);
-  g_free (name);
-
-  g_assert (postproc->mode);
-}
-
-static void
-gst_post_proc_base_init (GstPostProcClass * klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
-  gint ppidx;
-  gchar *longname, *description;
-
-  ppidx = GPOINTER_TO_INT (g_hash_table_lookup (global_plugins,
-          GINT_TO_POINTER (G_OBJECT_CLASS_TYPE (gobject_class))));
-
-  longname = g_strdup_printf ("LibPostProc %s filter",
-      filterdetails[ppidx].longname);
-  description = g_strdup_printf ("LibPostProc %s",
-      filterdetails[ppidx].description);
-  gst_element_class_set_static_metadata (element_class, longname,
-      "Filter/Video", description,
-      "Edward Hervey <edward@fluendo.com>, Mark Nauwelaerts (manauw@skynet.be)");
-  g_free (longname);
-  g_free (description);
-
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_post_proc_src_template));
-  gst_element_class_add_pad_template (element_class,
-      gst_static_pad_template_get (&gst_post_proc_sink_template));
-
-  klass->filterid = ppidx;
-}
-
-static void
-gst_post_proc_class_init (GstPostProcClass * klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-/*   GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass); */
-  GstVideoFilterClass *vfilter_class = GST_VIDEO_FILTER_CLASS (klass);
-  gint ppidx;
-
-  parent_class = g_type_class_peek_parent (klass);
-
-  gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_post_proc_set_property);
-  gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_post_proc_get_property);
-
-  /* common props */
-  g_object_class_install_property (gobject_class, PROP_QUALITY,
-      g_param_spec_uint ("quality", "Quality",
-          "Quality level of filter (higher is better)",
-          0, PP_QUALITY_MAX, DEFAULT_QUALITY,
-          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, PROP_AUTOQ,
-      g_param_spec_boolean ("autoq", "AutoQ",
-          "Automatically switch filter off if CPU too slow",
-          DEFAULT_AUTOQ, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class, PROP_SCOPE,
-      g_param_spec_enum ("scope", "Scope",
-          "Operate on chrominance and/or luminance",
-          GST_TYPE_PP_SCOPE, DEFAULT_SCOPE,
-          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  ppidx = klass->filterid;
-  /* per filter props */
-  if (g_strrstr (filterdetails[ppidx].longname, "deblock") != NULL &&
-      filterdetails[ppidx].longname[0] != 'x') {
-    /* deblocking */
-    g_object_class_install_property (gobject_class, PROP_DIFF,
-        g_param_spec_int ("difference", "Difference Factor",
-            "Higher values mean more deblocking (-1 = pp default)",
-            -1, G_MAXINT, DEFAULT_DIFF,
-            G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-    g_object_class_install_property (gobject_class, PROP_FLAT,
-        g_param_spec_int ("flatness", "Flatness Threshold",
-            "Lower values mean more deblocking (-1 = pp default)",
-            -1, G_MAXINT, DEFAULT_FLAT,
-            G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-    gobject_class->set_property =
-        GST_DEBUG_FUNCPTR (gst_post_proc_deblock_set_property);
-    gobject_class->get_property =
-        GST_DEBUG_FUNCPTR (gst_post_proc_deblock_get_property);
-  } else if (!(g_ascii_strcasecmp (filterdetails[ppidx].shortname, "tn"))) {
-    /* tmpnoise */
-    g_object_class_install_property (gobject_class, PROP_T1,
-        g_param_spec_int ("threshold-1", "Threshold One",
-            "Higher values mean stronger filtering (-1 = pp default)",
-            -1, G_MAXINT, DEFAULT_T1,
-            G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-    g_object_class_install_property (gobject_class, PROP_T2,
-        g_param_spec_int ("threshold-2", "Threshold Two",
-            "Higher values mean stronger filtering (-1 = pp default)",
-            -1, G_MAXINT, DEFAULT_T2,
-            G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-    g_object_class_install_property (gobject_class, PROP_T3,
-        g_param_spec_int ("threshold-3", "Threshold Three",
-            "Higher values mean stronger filtering (-1 = pp default)",
-            -1, G_MAXINT, DEFAULT_T3,
-            G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-    gobject_class->set_property =
-        GST_DEBUG_FUNCPTR (gst_post_proc_tmpnoise_set_property);
-    gobject_class->get_property =
-        GST_DEBUG_FUNCPTR (gst_post_proc_tmpnoise_get_property);
-  } else if (!(g_ascii_strcasecmp (filterdetails[ppidx].shortname, "al"))) {
-    /* autolevels */
-    g_object_class_install_property (gobject_class, PROP_RANGE,
-        g_param_spec_boolean ("fully-range", "Fully Range",
-            "Stretch luminance to (0-255)", DEFAULT_RANGE,
-            G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-    gobject_class->set_property =
-        GST_DEBUG_FUNCPTR (gst_post_proc_autolevels_set_property);
-    gobject_class->get_property =
-        GST_DEBUG_FUNCPTR (gst_post_proc_autolevels_get_property);
-
-  } else if (!(g_ascii_strcasecmp (filterdetails[ppidx].shortname, "fq"))) {
-    /* forcequant */
-    g_object_class_install_property (gobject_class, PROP_QUANT,
-        g_param_spec_int ("quantizer", "Force Quantizer",
-            "Quantizer to use (-1 = pp default)",
-            -1, G_MAXINT, DEFAULT_QUANT,
-            G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-    gobject_class->set_property =
-        GST_DEBUG_FUNCPTR (gst_post_proc_forcequant_set_property);
-    gobject_class->get_property =
-        GST_DEBUG_FUNCPTR (gst_post_proc_forcequant_get_property);
-  }
-
-  gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_post_proc_dispose);
-
-  vfilter_class->set_info = GST_DEBUG_FUNCPTR (gst_post_proc_set_info);
-  vfilter_class->transform_frame_ip =
-      GST_DEBUG_FUNCPTR (gst_post_proc_transform_frame_ip);
-}
-
-static void
-gst_post_proc_init (GstPostProc * postproc)
-{
-  /* properties */
-  postproc->quality = DEFAULT_QUALITY;
-  postproc->autoq = DEFAULT_AUTOQ;
-  postproc->scope = DEFAULT_SCOPE;
-  postproc->diff = DEFAULT_DIFF;
-  postproc->flat = DEFAULT_FLAT;
-  postproc->quant = DEFAULT_QUANT;
-  postproc->t1 = DEFAULT_T1;
-  postproc->t2 = DEFAULT_T2;
-  postproc->t3 = DEFAULT_T3;
-  postproc->range = DEFAULT_RANGE;
-  postproc->mode = NULL;
-  postproc->cargs = g_strdup ("");
-  postproc->args = g_strdup ("");
-  change_mode (postproc);
-
-  postproc->context = NULL;
-  postproc->width = 0;
-  postproc->height = 0;
-}
-
-static void
-gst_post_proc_dispose (GObject * object)
-{
-  GstPostProc *postproc = (GstPostProc *) object;
-
-  if (postproc->mode)
-    pp_free_mode (postproc->mode);
-  if (postproc->context)
-    pp_free_context (postproc->context);
-
-  g_free (postproc->cargs);
-  postproc->cargs = NULL;
-  g_free (postproc->args);
-  postproc->args = NULL;
-
-  G_OBJECT_CLASS (parent_class)->dispose (object);
-}
-
-static gboolean
-gst_post_proc_set_info (GstVideoFilter * vfilter, GstCaps * incaps,
-    GstVideoInfo * in_info, GstCaps * outcaps, GstVideoInfo * out_info)
-{
-  GstPostProc *postproc = (GstPostProc *) (vfilter);
-
-  change_context (postproc, in_info->width, in_info->height);
-
-  return TRUE;
-}
-
-static GstFlowReturn
-gst_post_proc_transform_frame_ip (GstVideoFilter * vfilter,
-    GstVideoFrame * frame)
-{
-  GstPostProc *postproc;
-  gint stride[3];
-  guint8 *outplane[3];
-  guint8 *inplane[3];
-  gint width, height;
-
-  /* postprocess the buffer ! */
-  postproc = (GstPostProc *) vfilter;
-
-  stride[0] = GST_VIDEO_FRAME_COMP_STRIDE (frame, 0);
-  stride[1] = GST_VIDEO_FRAME_COMP_STRIDE (frame, 1);
-  stride[2] = GST_VIDEO_FRAME_COMP_STRIDE (frame, 2);
-  outplane[0] = inplane[0] = GST_VIDEO_FRAME_COMP_DATA (frame, 0);
-  outplane[1] = inplane[1] = GST_VIDEO_FRAME_COMP_DATA (frame, 1);
-  outplane[2] = inplane[2] = GST_VIDEO_FRAME_COMP_DATA (frame, 2);
-
-  width = GST_VIDEO_FRAME_WIDTH (frame);
-  height = GST_VIDEO_FRAME_HEIGHT (frame);
-
-  GST_DEBUG_OBJECT (postproc, "calling pp_postprocess, width:%d, height:%d",
-      width, height);
-
-  pp_postprocess ((const guint8 **) inplane, stride, outplane, stride,
-      width, height, (int8_t *) "", 0, postproc->mode, postproc->context, 0);
-
-  return GST_FLOW_OK;
-}
-
-
-static void
-gst_post_proc_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec)
-{
-  GstPostProc *postproc = (GstPostProc *) object;
-  gchar *args;
-
-  switch (prop_id) {
-    case PROP_QUALITY:
-      postproc->quality = g_value_get_uint (value);
-      break;
-    case PROP_AUTOQ:
-      postproc->autoq = g_value_get_boolean (value);
-      break;
-    case PROP_SCOPE:
-      postproc->scope = g_value_get_enum (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-
-  /* construct common args */
-  args = postproc->autoq ? g_strdup ("autoq") : g_strdup ("");
-  switch (postproc->scope) {
-    case SCOPE_BOTH:
-      break;
-    case SCOPE_CHROMA:
-      append (&args, g_strdup ("noluma"));
-      break;
-    case SCOPE_LUMA:
-      append (&args, g_strdup ("nochrom"));
-      break;
-    default:
-      g_assert_not_reached ();
-      break;
-  }
-
-  g_free (postproc->cargs);
-  postproc->cargs = args;
-
-  change_mode (postproc);
-}
-
-static void
-gst_post_proc_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec)
-{
-  GstPostProc *postproc = (GstPostProc *) object;
-
-  switch (prop_id) {
-    case PROP_QUALITY:
-      g_value_set_uint (value, postproc->quality);
-      break;
-    case PROP_AUTOQ:
-      g_value_set_boolean (value, postproc->autoq);
-      break;
-    case PROP_SCOPE:
-      g_value_set_enum (value, postproc->scope);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-
-static void
-gst_post_proc_deblock_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec)
-{
-  GstPostProc *postproc = (GstPostProc *) object;
-
-  switch (prop_id) {
-    case PROP_DIFF:
-      postproc->diff = g_value_get_int (value);
-      break;
-    case PROP_FLAT:
-      postproc->flat = g_value_get_int (value);
-      break;
-    default:
-      gst_post_proc_set_property (object, prop_id, value, pspec);
-      break;
-  }
-
-  /* construct args */
-  g_free (postproc->args);
-  if (postproc->diff >= 0) {
-    postproc->args = g_strdup_printf ("%d", postproc->diff);
-    if (postproc->flat >= 0)
-      append (&postproc->args, g_strdup_printf ("%d", postproc->flat));
-  } else
-    postproc->args = g_strdup ("");
-  change_mode (postproc);
-}
-
-static void
-gst_post_proc_deblock_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec)
-{
-  GstPostProc *postproc = (GstPostProc *) object;
-
-  switch (prop_id) {
-    case PROP_DIFF:
-      g_value_set_int (value, postproc->diff);
-      break;
-    case PROP_FLAT:
-      g_value_set_int (value, postproc->flat);
-      break;
-    default:
-      gst_post_proc_get_property (object, prop_id, value, pspec);
-      break;
-  }
-}
-
-static void
-gst_post_proc_tmpnoise_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec)
-{
-  GstPostProc *postproc = (GstPostProc *) object;
-
-  switch (prop_id) {
-    case PROP_T1:
-      postproc->t1 = g_value_get_int (value);
-      break;
-    case PROP_T2:
-      postproc->t2 = g_value_get_int (value);
-      break;
-    case PROP_T3:
-      postproc->t3 = g_value_get_int (value);
-      break;
-    default:
-      gst_post_proc_set_property (object, prop_id, value, pspec);
-      break;
-  }
-
-  /* construct args */
-  g_free (postproc->args);
-  if (postproc->t1 >= 0) {
-    postproc->args = g_strdup_printf ("%d", postproc->t1);
-    if (postproc->t2 >= 0) {
-      append (&postproc->args, g_strdup_printf ("%d", postproc->t2));
-      if (postproc->t3 >= 0)
-        append (&postproc->args, g_strdup_printf ("%d", postproc->t3));
-    }
-  } else
-    postproc->args = g_strdup ("");
-  change_mode (postproc);
-}
-
-static void
-gst_post_proc_tmpnoise_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec)
-{
-  GstPostProc *postproc = (GstPostProc *) object;
-
-  switch (prop_id) {
-    case PROP_T1:
-      g_value_set_int (value, postproc->t1);
-      break;
-    case PROP_T2:
-      g_value_set_int (value, postproc->t2);
-      break;
-    case PROP_T3:
-      g_value_set_int (value, postproc->t3);
-      break;
-    default:
-      gst_post_proc_get_property (object, prop_id, value, pspec);
-      break;
-  }
-}
-
-static void
-gst_post_proc_autolevels_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec)
-{
-  GstPostProc *postproc = (GstPostProc *) object;
-
-  switch (prop_id) {
-    case PROP_RANGE:
-      postproc->range = g_value_get_boolean (value);
-      break;
-    default:
-      gst_post_proc_set_property (object, prop_id, value, pspec);
-      break;
-  }
-
-  /* construct args */
-  g_free (postproc->args);
-  if (postproc->range)
-    postproc->args = g_strdup ("f");
-  else
-    postproc->args = g_strdup ("");
-  change_mode (postproc);
-}
-
-static void
-gst_post_proc_autolevels_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec)
-{
-  GstPostProc *postproc = (GstPostProc *) object;
-
-  switch (prop_id) {
-    case PROP_RANGE:
-      g_value_set_boolean (value, postproc->range);
-      break;
-    default:
-      gst_post_proc_get_property (object, prop_id, value, pspec);
-      break;
-  }
-}
-
-static void
-gst_post_proc_forcequant_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec)
-{
-  GstPostProc *postproc = (GstPostProc *) object;
-
-  switch (prop_id) {
-    case PROP_QUANT:
-      postproc->quant = g_value_get_int (value);
-      break;
-    default:
-      gst_post_proc_set_property (object, prop_id, value, pspec);
-      break;
-  }
-
-  /* construct args */
-  g_free (postproc->args);
-  if (postproc->quant >= 0)
-    postproc->args = g_strdup_printf ("%d", postproc->quant);
-  else
-    postproc->args = g_strdup ("");
-  change_mode (postproc);
-}
-
-static void
-gst_post_proc_forcequant_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec)
-{
-  GstPostProc *postproc = (GstPostProc *) object;
-
-  switch (prop_id) {
-    case PROP_QUANT:
-      g_value_set_int (value, postproc->quant);
-      break;
-    default:
-      gst_post_proc_get_property (object, prop_id, value, pspec);
-      break;
-  }
-}
-
-
-static gboolean
-gst_post_proc_register (GstPlugin * plugin)
-{
-  GTypeInfo typeinfo = {
-    sizeof (GstPostProcClass),
-    (GBaseInitFunc) gst_post_proc_base_init,
-    NULL,
-    (GClassInitFunc) gst_post_proc_class_init,
-    NULL,
-    NULL,
-    sizeof (GstPostProc),
-    0,
-    (GInstanceInitFunc) gst_post_proc_init,
-  };
-  GType type;
-  int i;
-
-  global_plugins = g_hash_table_new (NULL, NULL);
-  for (i = 0; filterdetails[i].shortname; i++) {
-    gchar *type_name;
-
-    g_hash_table_insert (global_plugins, GINT_TO_POINTER (0),
-        GINT_TO_POINTER (i));
-
-    /* create type_name */
-    type_name = g_strdup_printf ("postproc_%s", filterdetails[i].longname);
-    if (g_type_from_name (type_name)) {
-      g_free (type_name);
-      continue;
-    }
-
-    /* create gtype */
-    type = g_type_register_static (GST_TYPE_VIDEO_FILTER, type_name,
-        &typeinfo, 0);
-
-    g_hash_table_insert (global_plugins, GINT_TO_POINTER (type),
-        GINT_TO_POINTER (i));
-
-    /* register element */
-    if (!gst_element_register (plugin, type_name, GST_RANK_PRIMARY, type)) {
-      g_free (type_name);
-      return FALSE;
-    }
-
-    g_free (type_name);
-  }
-  g_hash_table_remove (global_plugins, GINT_TO_POINTER (0));
-
-  return TRUE;
-}
-
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
-  GST_DEBUG_CATEGORY_INIT (postproc_debug, "postproc", 0,
-      "video postprocessing elements");
-
-#ifdef HAVE_ORC
-  orc_init ();
-#endif
-
-#ifndef GST_DISABLE_GST_DEBUG
-  av_log_set_callback (gst_ffmpeg_log_callback);
-#endif
-
-  /* Register the filters */
-  gst_post_proc_register (plugin);
-
-  /* Now we can return the pointer to the newly created Plugin object. */
-  return TRUE;
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    postproc,
-    "postprocessing elements (" LIBAV_SOURCE ")",
-    plugin_init, PACKAGE_VERSION, "GPL", "libav", "http://www.libav.org")
diff --git a/ext/libswscale/Makefile.in b/ext/libswscale/Makefile.in
index 8058e1b..23f14f9 100644
--- a/ext/libswscale/Makefile.in
+++ b/ext/libswscale/Makefile.in
@@ -289,8 +289,6 @@ PACKAGE_VERSION_RELEASE = @PACKAGE_VERSION_RELEASE@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PLUGINDIR = @PLUGINDIR@
-POSTPROC_CFLAGS = @POSTPROC_CFLAGS@
-POSTPROC_LIBS = @POSTPROC_LIBS@
 PROFILE_CFLAGS = @PROFILE_CFLAGS@
 PYTHON = @PYTHON@
 PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
diff --git a/ext/libswscale/gstffmpegscale.c b/ext/libswscale/gstffmpegscale.c
index 31849ba..ce980a8 100644
--- a/ext/libswscale/gstffmpegscale.c
+++ b/ext/libswscale/gstffmpegscale.c
@@ -23,11 +23,7 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <swscale.h>
-#else
 #include <libswscale/swscale.h>
-#endif
 
 #include <gst/gst.h>
 #include <gst/base/gstbasetransform.h>