You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

99 lines
3.1 KiB

diff -NaurEbBH gimp-gap.orig/configure.in gimp-gap/configure.in
--- gimp-gap.orig/configure.in 2013-04-16 13:30:03.000000000 +0400
+++ gimp-gap/configure.in 2013-04-20 21:04:24.215486712 +0400
@@ -1202,15 +1202,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
diff -NaurEbBH gimp-gap.orig/gap/Makefile.am gimp-gap/gap/Makefile.am
--- gimp-gap.orig/gap/Makefile.am 2013-04-16 13:30:03.000000000 +0400
+++ gimp-gap/gap/Makefile.am 2013-04-20 21:04:24.215486712 +0400
@@ -294,8 +294,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 = \
diff -NaurEbBH gimp-gap.orig/libgapvidapi/Makefile.am gimp-gap/libgapvidapi/Makefile.am
--- gimp-gap.orig/libgapvidapi/Makefile.am 2013-04-16 13:30:03.000000000 +0400
+++ gimp-gap/libgapvidapi/Makefile.am 2013-04-20 21:04:24.216486729 +0400
@@ -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_mp_util.c \
diff -NaurEbBH gimp-gap.orig/Makefile.am gimp-gap/Makefile.am
--- gimp-gap.orig/Makefile.am 2013-04-16 13:30:03.000000000 +0400
+++ gimp-gap/Makefile.am 2013-04-20 21:04:24.214486696 +0400
@@ -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)
diff -NaurEbBH gimp-gap.orig/po/POTFILES.in gimp-gap/po/POTFILES.in
--- gimp-gap.orig/po/POTFILES.in 2013-04-16 13:30:03.000000000 +0400
+++ gimp-gap/po/POTFILES.in 2013-04-20 21:07:07.901273795 +0400
@@ -43,7 +43,6 @@
gap/gap_mov_dialog.c
gap/gap_mov_exec.c
gap/gap_mov_main.c
-gap/gap_mpege.c
gap/gap_name2layer_main.c
gap/gap_navigator_dialog.c
gap/gap_onion_base.c
@@ -79,17 +78,10 @@
gap/gap_wr_resynth.c
gap/gap_wr_trans.c
gap/sel-to-anim-img.scm
-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_callbacks.c
-vid_enc_ffmpeg/gap_enc_ffmpeg_gui.c
-vid_enc_ffmpeg/gap_enc_ffmpeg_main.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