diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index a72ea38931..0000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "ext/codecparsers"]
-	path = ext/codecparsers
-	url = https://github.com/01org/gstreamer-codecparsers.git
diff --git a/Makefile.am b/Makefile.am
index 9331c49ca1..94182c68dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = debian.upstream ext gst-libs gst pkgconfig tests docs patches
+SUBDIRS = debian.upstream gst-libs gst pkgconfig tests docs patches
 
 # Extra clean files so that maintainer-clean removes *everything*
 MAINTAINERCLEANFILES = \
diff --git a/configure.ac b/configure.ac
index 734e1cfdc8..c1f17c52cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,11 +108,6 @@ AC_ARG_ENABLE(builtin_videoparsers,
                    [enable built-in videoparsers @<:@default=yes@:>@]),
     [], [enable_builtin_videoparsers="yes"])
 
-AC_ARG_ENABLE(builtin_codecparsers,
-    AS_HELP_STRING([--enable-builtin-codecparsers],
-                   [enable built-in codecparsers @<:@default=yes@:>@]),
-    [], [enable_builtin_codecparsers="yes"])
-
 AC_ARG_ENABLE([encoders],
     AS_HELP_STRING([--enable-encoders],
                    [enable video encoders @<:@default=yes@:>@]),
@@ -275,19 +270,11 @@ PKG_CHECK_MODULES([GST_BASEVIDEO],
 fi
 
 dnl ... bitstream parsers
-if test "$enable_builtin_codecparsers" = "yes"; then
-    ac_cv_have_gst_mpeg2_parser="no"
-    ac_cv_have_gst_h264_parser="no"
-    ac_cv_have_gst_jpeg_parser="no"
-    ac_cv_have_gst_vp8_parser="no"
-    ac_cv_have_gst_h265_parser="no"
-    ac_cv_have_gst_vp9_parser="no"
-else
 PKG_CHECK_MODULES([GST_CODEC_PARSERS],
     [gstreamer-codecparsers-$GST_PKG_VERSION >= $GST_PLUGINS_BAD_VERSION_REQUIRED])
-fi
 
 dnl ... MPEG-2 parser, with the required extensions
+HAVE_GST_MPEG2_PARSER=0
 AC_CACHE_CHECK([for MPEG-2 parser],
     ac_cv_have_gst_mpeg2_parser, [
     saved_CPPFLAGS="$CPPFLAGS"
@@ -306,16 +293,15 @@ AC_CACHE_CHECK([for MPEG-2 parser],
                   &seq_hdr, NULL);
               gst_mpeg_video_finalise_mpeg2_sequence_header(&seq_hdr,
                   &seq_ext, &seq_dpy);]])],
-        [ac_cv_have_gst_mpeg2_parser="yes"],
+        [ac_cv_have_gst_mpeg2_parser="yes" HAVE_GST_MPEG2_PARSER=1],
         [ac_cv_have_gst_mpeg2_parser="no"]
     )
     CPPFLAGS="$saved_CPPFLAGS"
     LIBS="$saved_LIBS"
 ])
-AM_CONDITIONAL([USE_LOCAL_CODEC_PARSERS_MPEG2],
-    [test "$ac_cv_have_gst_mpeg2_parser" != "yes"])
 
 dnl ... H.264 parser, with the required extensions
+HAVE_GST_H264_PARSER=0
 AC_CACHE_CHECK([for H.264 parser],
     ac_cv_have_gst_h264_parser, [
     saved_CPPFLAGS="$CPPFLAGS"
@@ -335,16 +321,15 @@ AC_CACHE_CHECK([for H.264 parser],
               sps.extension.mvc.num_views_minus1 = 1;
               GstH264NalUnit nalu;
               nalu.extension_type = GST_H264_NAL_EXTENSION_MVC;]])],
-        [ac_cv_have_gst_h264_parser="yes"],
+        [ac_cv_have_gst_h264_parser="yes" HAVE_GST_H264_PARSER=1],
         [ac_cv_have_gst_h264_parser="no"]
     )
     CPPFLAGS="$saved_CPPFLAGS"
     LIBS="$saved_LIBS"
 ])
-AM_CONDITIONAL([USE_LOCAL_CODEC_PARSERS_H264],
-    [test "$ac_cv_have_gst_h264_parser" != "yes"])
 
-dnl ... JPEG parser, not upstream yet
+dnl ... JPEG parser
+HAVE_GST_JPEG_PARSER=0
 AC_CACHE_CHECK([for JPEG parser],
     ac_cv_have_gst_jpeg_parser, [
     saved_CPPFLAGS="$CPPFLAGS"
@@ -355,16 +340,15 @@ AC_CACHE_CHECK([for JPEG parser],
         [AC_LANG_PROGRAM(
             [[#include <gst/codecparsers/gstjpegparser.h>]],
             [[GstJpegFrameHdr frame_hdr;]])],
-        [ac_cv_have_gst_jpeg_parser="yes"],
+        [ac_cv_have_gst_jpeg_parser="yes" HAVE_GST_JPEG_PARSER=1],
         [ac_cv_have_gst_jpeg_parser="no"]
     )
     CPPFLAGS="$saved_CPPFLAGS"
     LIBS="$saved_LIBS"
 ])
-AM_CONDITIONAL([USE_LOCAL_CODEC_PARSERS_JPEG],
-    [test "$ac_cv_have_gst_jpeg_parser" != "yes"])
 
-dnl ... VP8 parser, not upstream yet
+dnl ... VP8 parser
+HAVE_GST_VP8_PARSER=0
 AC_CACHE_CHECK([for VP8 parser],
     ac_cv_have_gst_vp8_parser, [
     saved_CPPFLAGS="$CPPFLAGS"
@@ -375,16 +359,15 @@ AC_CACHE_CHECK([for VP8 parser],
         [AC_LANG_PROGRAM(
             [[#include <gst/codecparsers/gstvp8parser.h>]],
             [[GstVp8FrameHdr frame_hdr;]])],
-        [ac_cv_have_gst_vp8_parser="yes"],
+        [ac_cv_have_gst_vp8_parser="yes" HAVE_GST_VP8_PARSER=1],
         [ac_cv_have_gst_vp8_parser="no"]
     )
     CPPFLAGS="$saved_CPPFLAGS"
     LIBS="$saved_LIBS"
 ])
-AM_CONDITIONAL([USE_LOCAL_CODEC_PARSERS_VP8],
-    [test "$ac_cv_have_gst_vp8_parser" != "yes"])
 
 dnl ... VP9 parser, with required extensions
+HAVE_GST_VP9_PARSER=0
 AC_CACHE_CHECK([for VP9 parser],
     ac_cv_have_gst_vp9_parser, [
     saved_CPPFLAGS="$CPPFLAGS"
@@ -395,16 +378,15 @@ AC_CACHE_CHECK([for VP9 parser],
         [AC_LANG_PROGRAM(
             [[#include <gst/codecparsers/gstvp9parser.h>]],
             [[GstVp9FrameHdr frame_hdr;]])],
-        [ac_cv_have_gst_vp9_parser="yes"],
+        [ac_cv_have_gst_vp9_parser="yes" HAVE_GST_VP9_PARSER=1],
         [ac_cv_have_gst_vp9_parser="no"]
     )
     CPPFLAGS="$saved_CPPFLAGS"
     LIBS="$saved_LIBS"
 ])
-AM_CONDITIONAL([USE_LOCAL_CODEC_PARSERS_VP9],
-    [test "$ac_cv_have_gst_vp9_parser" != "yes"])
 
 dnl ... H.265 parser, with the required extensions
+HAVE_GST_H265_PARSER=0
 AC_CACHE_CHECK([for H.265 parser],
     ac_cv_have_gst_h265_parser, [
     saved_CPPFLAGS="$CPPFLAGS"
@@ -423,18 +405,12 @@ AC_CACHE_CHECK([for H.265 parser],
               GstH265SPS sps;
               sps.crop_rect_x = 0;
               sps.crop_rect_width = 0;]])],
-        [ac_cv_have_gst_h265_parser="yes"],
+        [ac_cv_have_gst_h265_parser="yes" HAVE_GST_H265_PARSER=1],
         [ac_cv_have_gst_h265_parser="no"]
     )
     CPPFLAGS="$saved_CPPFLAGS"
     LIBS="$saved_LIBS"
 ])
-AM_CONDITIONAL([USE_LOCAL_CODEC_PARSERS_H265],
-    [test "$ac_cv_have_gst_h265_parser" != "yes"])
-
-dnl ... video parsers
-AM_CONDITIONAL([USE_LOCAL_VIDEO_PARSERS],
-    [test "$enable_builtin_videoparsers" = "yes"])
 
 dnl ... opengl helper libraries
 HAVE_GSTGL=0
@@ -779,7 +755,7 @@ AC_CACHE_CHECK([for JPEG decoding API],
               VASliceParameterBufferJPEGBaseline slice_param;
               VAHuffmanTableBufferJPEGBaseline huffman_table;
               VAIQMatrixBufferJPEGBaseline iq_matrix;]])],
-        [ac_cv_have_jpeg_decoding_api="yes" USE_JPEG_DECODER=1],
+        [ac_cv_have_jpeg_decoding_api="yes" USE_JPEG_DECODER=$HAVE_GST_JPEG_PARSER],
         [ac_cv_have_jpeg_decoding_api="no"]
     )
     CPPFLAGS="$saved_CPPFLAGS"
@@ -813,7 +789,7 @@ AC_CACHE_CHECK([for VP8 decoding API],
               VAIQMatrixBufferVP8 iq_matrix;
               slice_param.slice_data_offset = 0;
               slice_param.slice_data_flag = 0;]])],
-        [ac_cv_have_vp8_decoding_api="yes" USE_VP8_DECODER=1],
+        [ac_cv_have_vp8_decoding_api="yes" USE_VP8_DECODER=$HAVE_GST_VP8_PARSER],
         [ac_cv_have_vp8_decoding_api="no"]
     )
     CPPFLAGS="$saved_CPPFLAGS"
@@ -846,7 +822,7 @@ AC_CACHE_CHECK([for VP9 decoding API],
               VASegmentParameterVP9 seg_param;
               slice_param.slice_data_offset = 0;
               slice_param.slice_data_flag = 0;]])],
-        [ac_cv_have_vp9_decoding_api="yes" USE_VP9_DECODER=1],
+        [ac_cv_have_vp9_decoding_api="yes" USE_VP9_DECODER=$HAVE_GST_VP9_PARSER],
         [ac_cv_have_vp9_decoding_api="no"]
     )
     CPPFLAGS="$saved_CPPFLAGS"
@@ -879,7 +855,7 @@ AC_CACHE_CHECK([for HEVC decoding API],
               VAIQMatrixBufferHEVC iq_matrix;
               slice_param.slice_data_offset = 0;
               slice_param.slice_data_flag = 0;]])],
-        [ac_cv_have_hevc_decoding_api="yes" USE_HEVC_DECODER=1],
+        [ac_cv_have_hevc_decoding_api="yes" USE_HEVC_DECODER=$HAVE_GST_H265_PARSER],
         [ac_cv_have_hevc_decoding_api="no"]
     )
     CPPFLAGS="$saved_CPPFLAGS"
@@ -1124,11 +1100,9 @@ debian.upstream/libgstvaapi-x11.install.in
     docs/reference/libs/libs-docs.xml
     docs/reference/plugins/Makefile
     docs/reference/plugins/plugins-docs.xml
-    ext/Makefile
     gst-libs/Makefile
     gst-libs/gst/Makefile
     gst-libs/gst/base/Makefile
-    gst-libs/gst/codecparsers/Makefile
     gst-libs/gst/vaapi/Makefile
     gst/Makefile
     gst/vaapi/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
deleted file mode 100644
index b639f03c82..0000000000
--- a/ext/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-EXTRA_DIST =
-
-codecparsers_srcdir = \
-	$(top_srcdir)/ext/codecparsers/gst-libs/gst/codecparsers
-
-codecparsers_source_c = \
-	dboolhuff.c		\
-	gsth264parser.c		\
-	gstjpegparser.c		\
-	gstmpeg4parser.c	\
-	gstmpegvideoparser.c	\
-	gstvc1parser.c		\
-	gstvp8parser.c		\
-	gstvp8rangedecoder.c	\
-	nalutils.c		\
-	parserutils.c		\
-	vp8utils.c		\
-	gsth265parser.c         \
-	gstvp9parser.c          \
-	vp9utils.c              \
-	$(NULL)
-
-EXTRA_DIST += $(codecparsers_source_c:%.c=$(codecparsers_srcdir)/%.c)
-
-codecparsers_source_h = \
-	dboolhuff.h		\
-	gsth264parser.h		\
-	gstjpegparser.h		\
-	gstmpeg4parser.h	\
-	gstmpegvideoparser.h	\
-	gstvc1parser.h		\
-	gstvp8parser.h		\
-	gstvp8rangedecoder.h	\
-	nalutils.h		\
-	parserutils.h		\
-	vp8utils.h		\
-	gsth265parser.h         \
-	gstvp9parser.h          \
-	vp9utils.h              \
-	$(NULL)
-
-EXTRA_DIST += $(codecparsers_source_h:%.h=$(codecparsers_srcdir)/%.h)
-
-videoparsers_srcdir = \
-	$(top_srcdir)/ext/codecparsers/gst/videoparsers
-
-videoparsers_source_c = \
-	gsth264parse.c		\
-	gsth265parse.c		\
-	$(NULL)
-
-EXTRA_DIST += $(videoparsers_source_c:%.c=$(videoparsers_srcdir)/%.c)
-
-videoparsers_source_h = \
-	gsth264parse.h		\
-	gsth265parse.h		\
-	$(NULL)
-
-EXTRA_DIST += $(videoparsers_source_h:%.h=$(videoparsers_srcdir)/%.h)
-
--include $(top_srcdir)/git.mk
diff --git a/ext/codecparsers b/ext/codecparsers
deleted file mode 160000
index d9f25273df..0000000000
--- a/ext/codecparsers
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d9f25273dfa3fe0f5f791c6e35b1243f6462d990
diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am
index 77be8ee030..de02514679 100644
--- a/gst-libs/gst/Makefile.am
+++ b/gst-libs/gst/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = base codecparsers vaapi
+SUBDIRS = base vaapi
 
 -include $(top_srcdir)/git.mk
diff --git a/gst-libs/gst/codecparsers/Makefile.am b/gst-libs/gst/codecparsers/Makefile.am
deleted file mode 100644
index ac1654dd8b..0000000000
--- a/gst-libs/gst/codecparsers/Makefile.am
+++ /dev/null
@@ -1,96 +0,0 @@
-noinst_LTLIBRARIES =				\
-	libgstvaapi-codecparsers.la		\
-	$(NULL)
-
-local_codecparsers_srcdir = \
-	$(top_srcdir)/ext/codecparsers/gst-libs/gst/codecparsers
-
-libgstvaapi_codecparsers_cflags =		\
-	-DGST_USE_UNSTABLE_API			\
-	-I$(top_srcdir)/gst-libs		\
-	-I$(top_builddir)/gst-libs		\
-	$(GST_BASE_CFLAGS)			\
-	$(GST_CFLAGS)				\
-	$(NULL)
-
-libgstvaapi_codecparsers_libs =			\
-	$(GST_BASE_LIBS)			\
-	$(GST_LIBS)				\
-	$(NULL)
-
-add_source_c =
-add_source_h =
-gen_source_c = parserutils.c nalutils.c
-gen_source_h = parserutils.h nalutils.h
-
-# Always build VC-1 and MPEG-4 parsers for now
-gen_source_c += gstvc1parser.c gstmpeg4parser.c
-gen_source_h += gstvc1parser.h gstmpeg4parser.h
-
-if USE_LOCAL_CODEC_PARSERS_JPEG
-gen_source_c += gstjpegparser.c
-gen_source_h += gstjpegparser.h
-endif
-
-if USE_LOCAL_CODEC_PARSERS_MPEG2
-gen_source_c += gstmpegvideoparser.c
-gen_source_h += gstmpegvideoparser.h
-endif
-
-if USE_LOCAL_CODEC_PARSERS_H264
-gen_source_c += gsth264parser.c
-gen_source_h += gsth264parser.h
-endif
-
-if USE_LOCAL_CODEC_PARSERS_VP8
-gen_source_c += gstvp8parser.c dboolhuff.c gstvp8rangedecoder.c vp8utils.c
-gen_source_h += gstvp8parser.h gstvp8rangedecoder.h vp8utils.h dboolhuff.h
-endif
-
-if USE_LOCAL_CODEC_PARSERS_VP9
-gen_source_c += gstvp9parser.c vp9utils.c
-gen_source_h += gstvp9parser.h vp9utils.h
-endif
-
-if USE_LOCAL_CODEC_PARSERS_H265
-gen_source_c += gsth265parser.c
-gen_source_h += gsth265parser.h
-endif
-
-GENFILES = \
-	$(gen_source_c)				\
-	$(gen_source_h)				\
-	$(NULL)
-
-nodist_EXTRA_libgstvaapi_codecparsers_la_SOURCES = dummy.c
-
-nodist_libgstvaapi_codecparsers_la_SOURCES =	\
-	$(gen_source_c)				\
-	$(add_source_c)				\
-	$(NULL)
-
-libgstvaapi_codecparsers_la_CFLAGS =		\
-	$(libgstvaapi_codecparsers_cflags)	\
-	$(NULL)
-
-libgstvaapi_codecparsers_la_LIBADD =		\
-	$(libgstvaapi_codecparsers_libs)	\
-	$(NULL)
-
-libgstvaapi_codecparsers_la_LDFLAGS =		\
-	$(GST_ALL_LDFLAGS)			\
-	$(NULL)
-
-all-local: .timestamp.symlinks
-
-.timestamp.symlinks: $(GENFILES)
-	touch $@
-
-$(gen_source_c): %.c: $(local_codecparsers_srcdir)/%.c $(gen_source_h)
-	$(LN_S) -f $< $@
-$(gen_source_h): %.h: $(local_codecparsers_srcdir)/%.h
-	$(LN_S) -f $< $@
-
-DISTCLEANFILES = $(GENFILES) .timestamp.symlinks
-
--include $(top_srcdir)/git.mk
diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am
index 314fd2d226..1818f75c50 100644
--- a/gst-libs/gst/vaapi/Makefile.am
+++ b/gst-libs/gst/vaapi/Makefile.am
@@ -45,7 +45,7 @@ libgstvaapi_libs =				\
 	$(GST_CODEC_PARSERS_LIBS)		\
 	$(LIBVA_LIBS)				\
 	$(top_builddir)/gst-libs/gst/base/libgstvaapi-baseutils.la \
-	$(top_builddir)/gst-libs/gst/codecparsers/libgstvaapi-codecparsers.la
+	$(NULL)
 
 libgstvaapi_source_c =				\
 	gstvaapibufferproxy.c			\
diff --git a/gst/vaapi/Makefile.am b/gst/vaapi/Makefile.am
index e99493e0a9..0fb9ad3cb2 100644
--- a/gst/vaapi/Makefile.am
+++ b/gst/vaapi/Makefile.am
@@ -163,98 +163,6 @@ libgstvaapi_la_LIBADD =	\
 libgstvaapi_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvaapi_la_LIBTOOLFLAGS = --tag=disable-static
 
-BUILT_SOURCES =
-
-if USE_LOCAL_VIDEO_PARSERS
-plugin_LTLIBRARIES += libgstvaapi_parse.la
-
-libgstvaapi_parse_gen_source_c = \
-	gsth264parse.c		\
-	$(NULL)
-
-libgstvaapi_parse_gen_source_h = \
-	gsth264parse.h		\
-	$(NULL)
-
-libgstvaapi_1_4p_parse_gen_source_c = \
-	gsth265parse.c \
-	$(NULL)
-
-libgstvaapi_1_4p_parse_gen_source_h = \
-	gsth265parse.h \
-	$(NULL)
-
-libgstvaapi_parse_gen_sources = \
-	$(libgstvaapi_parse_gen_source_c) 	\
-	$(libgstvaapi_parse_gen_source_h) 	\
-	$(NULL)
-
-if USE_GST_API_1_4p
-libgstvaapi_parse_gen_source_c += $(libgstvaapi_1_4p_parse_gen_source_c)
-libgstvaapi_parse_gen_source_h += $(libgstvaapi_1_4p_parse_gen_source_h)
-endif
-
-libgstvaapi_parse_la_SOURCES = gstvaapiparse.c gstvaapiparse.h
-nodist_libgstvaapi_parse_la_SOURCES =		\
-	$(libgstvaapi_parse_gen_source_c)	\
-	$(libgstvaapi_parse_gen_source_h)	\
-	$(NULL)
-
-libgstvaapi_parse_la_CFLAGS = \
-	-DGST_USE_UNSTABLE_API			\
-	-I$(top_srcdir)/gst-libs		\
-	-I$(top_builddir)/gst-libs		\
-	$(GST_CFLAGS)				\
-	$(GST_BASE_CFLAGS)			\
-	$(GST_PLUGINS_BASE_CFLAGS)		\
-	$(GST_VIDEO_CFLAGS) 			\
-	$(GST_CODEC_PARSERS_CFLAGS)		\
-	$(NULL)
-
-libgstvaapi_parse_la_LIBADD = \
-	$(top_builddir)/gst-libs/gst/codecparsers/libgstvaapi-codecparsers.la \
-	$(GST_LIBS)				\
-	$(GST_BASE_LIBS)			\
-	$(GST_PLUGINS_BASE_LIBS)		\
-	$(GST_VIDEO_LIBS) -lgstpbutils-$(GST_PKG_VERSION) \
-	$(GST_CODEC_PARSERS_LIBS)		\
-	$(NULL)
-
-libgstvaapi_parse_la_LDFLAGS		= $(GST_PLUGIN_LDFLAGS)
-libgstvaapi_parse_la_LIBTOOLFLAGS	= --tag=disable-static
-
-videoparsers_sources_dir = \
-	$(top_srcdir)/ext/codecparsers/gst/videoparsers
-videoparsers_patches_dir = \
-	$(top_srcdir)/patches/videoparsers
-include $(videoparsers_patches_dir)/series.frag
-videoparsers_patches = \
-	$(videoparsers_patches_base:%=$(top_srcdir)/patches/videoparsers/%)
-if USE_GST_API_1_4p
-videoparsers_patches += \
-	$(videoparsers_patches_1_4p:%=$(top_srcdir)/patches/videoparsers/%)
-endif
-videoparsers_orig_sources = \
-	$(libgstvaapi_parse_gen_sources:%=$(videoparsers_sources_dir)/%)
-
-$(libgstvaapi_parse_gen_sources): $(videoparsers_orig_sources)
-	cp -f $(videoparsers_sources_dir)/$@ $@
-
-videoparsers.prepare.stamp: $(videoparsers_patches) $(libgstvaapi_parse_gen_sources)
-	@for f in $(videoparsers_patches); do	\
-	   patch -p3 < $$f;			\
-	done
-	@touch $@
-
-BUILT_SOURCES += \
-	$(libgstvaapi_parse_gen_sources) \
-	videoparsers.prepare.stamp
-endif
-
-CLEANFILES = \
-	videoparsers.prepare.stamp	\
-	$(libgstvaapi_parse_gen_sources)
-
 EXTRA_DIST = \
 	$(libgstvaapi_enc_source_c)	 \
 	$(libgstvaapi_enc_source_h)	 \