--- Makefile.am
+++ Makefile.am
@@ -18,21 +18,12 @@
 VID_COMMON=vid_common
 VID_ENC_RAWFRAMES=vid_enc_rawframes
 VID_ENC_SINGLE=vid_enc_single
-VID_ENC_AVI=vid_enc_avi
 ##  endif
 
-# the ffmpeg based video encoder depends on ENABLE_GVA_LIBAVFORMAT_SUPPORT
-# and is not bulit when disabled.
-if ENABLE_GVA_LIBAVFORMAT_SUPPORT
-VID_ENC_FFMPEG=vid_enc_ffmpeg
-endif
 
-
-SUBDIRS = libgapbase extern_libs images $(LIBWAVCLIENT) $(LIBGAPVIDAPI) gap po docs \
+SUBDIRS = libgapbase images $(LIBWAVCLIENT) $(LIBGAPVIDAPI) gap po docs \
 	$(LIBGAPVIDUTIL) 	\
 	$(VID_COMMON)		\
-	$(VID_ENC_AVI) 		\
-	$(VID_ENC_FFMPEG) 	\
 	$(VID_ENC_RAWFRAMES) 	\
 	$(VID_ENC_SINGLE)
 
--- configure.in
+++ configure.in
@@ -1048,15 +1048,12 @@
 AC_OUTPUT([
 Makefile
 libgapbase/Makefile
-extern_libs/Makefile
 images/Makefile
 gap/Makefile
 libwavplayclient/Makefile
 libgapvidapi/Makefile
 libgapvidutil/Makefile
 vid_common/Makefile
-vid_enc_avi/Makefile
-vid_enc_ffmpeg/Makefile
 vid_enc_rawframes/Makefile
 vid_enc_single/Makefile
 po/Makefile.in
--- gap/Makefile.am
+++ gap/Makefile.am
@@ -226,8 +226,6 @@
 	gap_decode_xanim.c	\
 	gap_decode_xanim.h	\
 	gap_frontends_main.c	\
-	gap_mpege.c		\
-	gap_mpege.h		\
 	gap_libgimpgap.h	
 
 gap_decode_mplayer_SOURCES = \
--- libgapvidapi/Makefile.am
+++ libgapvidapi/Makefile.am
@@ -27,9 +27,6 @@
 # .c sourcefiles in gap_vid_api.c (except example.c)
 EXTRA_DIST = \
 	gap_vid_api_gimp.c	\
-	gap_vid_api_ffmpeg.c	\
-	gap_vid_api_mpeg3.c	\
-	gap_vid_api_mpeg3toc.c	\
 	gap_vid_api_quicktime.c	\
 	gap_vid_api_util.c	\
 	gap_vid_api_vidindex.c	\
--- po/POTFILES.in
+++ po/POTFILES.in
@@ -27,7 +27,6 @@
 gap/gap_morph_tween_dialog.c
 gap/gap_mov_dialog.c
 gap/gap_mov_exec.c
-gap/gap_mpege.c
 gap/gap_name2layer_main.c
 gap/gap_navigator_dialog.c
 gap/gap_onion_base.c
@@ -60,17 +59,10 @@
 gap/gap_wr_opacity.c
 gap/gap_wr_resynth.c
 gap/gap_wr_trans.c
-libgapvidapi/gap_vid_api_mpeg3.c
 libgapvidapi/gap_vid_api_vidindex.c
 libgapvidutil/gap_gve_sox.c
 libgapvidutil/gap_gve_story.c
 vid_common/gap_cme_gui.c
 vid_common/gap_cme_main.c
-vid_enc_avi/gap_enc_avi_gui.c
-vid_enc_avi/gap_enc_avi_main.c
-vid_enc_ffmpeg/gap_enc_ffmpeg_gui.c
-vid_enc_ffmpeg/gap_enc_ffmpeg_main.c
-vid_enc_ffmpeg/gap_enc_ffmpeg_callbacks.c
-vid_enc_ffmpeg/gap_enc_ffmpeg_par.c
 vid_enc_rawframes/gap_enc_rawframes_main.c
 vid_enc_single/gap_enc_singleframes_main.c