Sophie: avidemux-2.3.0-6mdv2007.0 src

avidemux-2.3.0-6mdv2007.0.src.rpm

diff -Nurp -x '*~' avidemux_2.3.0/avidemux/ADM_audiocodec/ADM_audiocodeclist.h avidemux_2.3.0-f/avidemux/ADM_audiocodec/ADM_audiocodeclist.h
--- avidemux_2.3.0/avidemux/ADM_audiocodec/ADM_audiocodeclist.h	2006-09-09 21:03:13.000000000 +0300
+++ avidemux_2.3.0-f/avidemux/ADM_audiocodec/ADM_audiocodeclist.h	2007-03-13 23:30:27.000000000 +0200
@@ -24,7 +24,9 @@ typedef struct {
 #endif
                 {"mp2", "FFm MP2", AUDIOENC_MP2},
                 {"ac3", "FFm AC3",AUDIOENC_AC3},
+#ifdef USE_TOOLAME
                 {"twolame","Twolame", AUDIOENC_2LAME},
+#endif
                 {"none", "Wav PCM",AUDIOENC_NONE},
                 {"lpcm", "Wav LPCM",AUDIOENC_LPCM}
 };
diff -Nurp -x '*~' avidemux_2.3.0/avidemux/ADM_audiofilter/audiofilter_buildchain.cpp avidemux_2.3.0-f/avidemux/ADM_audiofilter/audiofilter_buildchain.cpp
--- avidemux_2.3.0/avidemux/ADM_audiofilter/audiofilter_buildchain.cpp	2006-09-03 19:51:56.000000000 +0300
+++ avidemux_2.3.0-f/avidemux/ADM_audiofilter/audiofilter_buildchain.cpp	2007-03-13 23:52:17.000000000 +0200
@@ -53,7 +53,9 @@
 #include "ADM_audiofilter/audioencoder_aften.h"
 #endif
 
+#ifdef USE_TOOLAME
 #include "ADM_audiofilter/audioencoder_twolame.h"
+#endif
 #include "ADM_audiofilter/audioencoder_lavcodec.h"
 
 
@@ -397,6 +399,7 @@ AVDMGenericAudioStream *buildAudioFilter
                       tmpfilter=lavcodec;
                     }
               break;
+#ifdef USE_TOOLAME
     case  AUDIOENC_2LAME:
               {
                   AUDMEncoder_Twolame *toolame_enc = NULL;
@@ -404,6 +407,7 @@ AVDMGenericAudioStream *buildAudioFilter
                           tmpfilter=toolame_enc;
               }
     	  break;
+#endif
 
     default:
       ADM_assert(0);
diff -Nurp -x '*~' avidemux_2.3.0/avidemux/ADM_audiofilter/Makefile.am avidemux_2.3.0-f/avidemux/ADM_audiofilter/Makefile.am
--- avidemux_2.3.0/avidemux/ADM_audiofilter/Makefile.am	2006-09-03 19:51:56.000000000 +0300
+++ avidemux_2.3.0-f/avidemux/ADM_audiofilter/Makefile.am	2007-03-13 23:56:06.000000000 +0200
@@ -12,13 +12,15 @@ libADM_audiofilter_a_SOURCES = audiodeng
 		audiofilter_mixer.cpp audiofilter_bridge.cpp audioencoder.cpp \
 		audiofilter_limiter.cpp audiofilter_buildchain.cpp \
 		audiofilter_sox.cpp audiofilter_film2pal.cpp \
-		audioencoder_lame.cpp audioencoder_twolame.cpp \
+		audioencoder_lame.cpp \
 		audioencoder_faac.cpp audioencoder_lavcodec.cpp \
 		audioencoder_vorbis.cpp audioencoder_pcm.cpp \
 		audio_raw.cpp audiofilter_channel_route.cpp \
 		audiofilter_dolby.cpp audioencoder_aften.cpp
 
-
+if USE_TOOLAME
+libADM_audiofilter_a_SOURCES += audioencoder_twolame.cpp
+endif
 
 EXTRA_DIST = audio_raw.cpp               audioencoder_pcm.h        \
 audiofilter_film2pal.h \
diff -Nurp -x '*~' avidemux_2.3.0/avidemux/ADM_lavcodec/Makefile.am avidemux_2.3.0-f/avidemux/ADM_lavcodec/Makefile.am
--- avidemux_2.3.0/avidemux/ADM_lavcodec/Makefile.am	2006-10-08 17:32:02.000000000 +0300
+++ avidemux_2.3.0-f/avidemux/ADM_lavcodec/Makefile.am	2007-03-15 21:42:40.000000000 +0200
@@ -44,7 +44,7 @@ fft_sse.o:i386/fft_sse.c
 vp3dsp_sse2.o:i386/vp3dsp_sse2.c
 	$(CC) -o $@ $< -c  $(CFLAGS) $(all_includes) -I.. -DHAVE_AV_CONFIG_H $(X_MMX_FLAGS) -O3 -msse -I$(LAVUTIL) -I../..
 
-libavcodec_a_SOURCES = $(EXTEND_PPC) $(EXTEND_MMX) ac3enc.c $(EXTEND_AMR) \
+libavcodec_a_SOURCES = $(EXTEND_PPC) $(EXTEND_MMX) ac3enc.c \
 		adpcm.c 	allcodecs.c 	cyuv.c 	dsputil.c 	dv.c \
 		error_resilience.c 		fdctref.c 	fft.c 	h263.c 	h263dec.c 	huffyuv.c 	imgconvert.c \
 		imgresample.c 	jfdctfst.c 	jfdctint.c 	jrevdct.c 	mace.c 	mdct.c 	 	mjpeg.c \
@@ -55,11 +55,15 @@ libavcodec_a_SOURCES = $(EXTEND_PPC) $(E
 		roqvideo.c 	xan.c 	rpza.c 	msrle.c 	msvideo1.c 	cinepak.c 	vqavideo.c \
 		idcinvideo.c 	smc.c 	flicvideo.c 	interplayvideo.c 	dpcm.c 	8bps.c vmdav.c \
 		truemotion1.c flac.c g726.c 	qtrle.c lcl.c 	snow.c  \
-		rangecoder.c bitstream.c h264idct.c h261.c amr.c tscc.c \
+		rangecoder.c bitstream.c h264idct.c h261.c tscc.c \
 		resample2.c imgresample.c pthread.c qdm2.c bitstream_filter.c eval.c \
 		vc1.c vc1dsp.c
 	
 
+if AMR_NB
+libavcodec_a_SOURCES += $(EXTEND_AMR) amr.c
+endif
+
 EXTRA_DIST = ac3.h    faandct.h      internal.h   \
 oggvorbis.h  snow.h     vc1data.h \
 ac3tab.h   fastmemcpy.h     lzo.h      opt.h    sp5x.h     vorbis.h \
diff -Nurp -x '*~' avidemux_2.3.0/avidemux/Makefile.am avidemux_2.3.0-f/avidemux/Makefile.am
--- avidemux_2.3.0/avidemux/Makefile.am	2006-10-01 17:40:47.000000000 +0300
+++ avidemux_2.3.0-f/avidemux/Makefile.am	2007-03-14 00:58:41.000000000 +0200
@@ -17,7 +17,7 @@ SUBDIRS = ADM_library ADM_audio ADM_audi
 	ADM_colorspace ADM_editor ADM_encoder ADM_filter  ADM_inpics ADM_nuv \
 	ADM_toolkit oplug_mpeg xpm ADM_video oplug_avi ADM_audiodevice ADM_vp32 \
 	libMpeg2Dec oplug_mpegFF ADM_h263 ADM_gui2 ADM_dialog \
-	ADM_ogm ADM_3gp mpeg2enc ADM_openDML ADM_lvemux libtoolame ADM_requant \
+	ADM_ogm ADM_3gp mpeg2enc ADM_openDML ADM_lvemux ADM_requant \
 	ADM_script oplug_ogm ADM_xvidratectl ADM_mplex ADM_ocr ADM_libswscale \
 	ADM_mpegdemuxer ADM_tray ADM_lavutil ADM_lavformat ADM_lavcodec oplug_mp4 \
 	ADM_avsproxy  ADM_liba52 ADM_libMad ADM_matroska ADM_asf
@@ -63,7 +63,6 @@ avidemux2_LDADD   =  ADM_dialog/DIA_quot
 ./ADM_video/libADM_video.a   ./ADM_encoder/libADM_encoder.a  \
 ./ADM_codecs/libADM_codecs.a ./ADM_vp32/libADM_vp32.a  \
 ./ADM_audiofilter/libADM_audiofilter.a \
-./libtoolame/liblibtoolame.a \
 ./ADM_gui2/libADM_gui2.a  \
 ./ADM_libswscale/libswscale.a \
 ./mpeg2enc/libmpeg2enc.a \
@@ -94,6 +93,11 @@ avidemux2_LDADD   =  ADM_dialog/DIA_quot
 $(libmpeg2enc_Altivec) 
 
 
+if USE_TOOLAME
+SUBDIRS += libtoolame
+avidemux2_LDADD += ./libtoolame/liblibtoolame.a
+endif
+
 INCLUDES = $(all_includes) $(GTK_CFLAGS) $(XML_CFLAGS) \
 	$(SMONKEY_CFLAGS) \
 	-DADMLOCALE='"'$(ADM_LOCALEDIR)'"' \
diff -Nurp -x '*~' avidemux_2.3.0/configure.in.in avidemux_2.3.0-f/configure.in.in
--- avidemux_2.3.0/configure.in.in	2006-11-25 23:02:02.000000000 +0200
+++ avidemux_2.3.0-f/configure.in.in	2007-03-15 21:40:48.000000000 +0200
@@ -168,8 +168,6 @@ AC_DEFINE(USE_FFMPEG,1,[FFMPEG])
 dnl yes we are a free country :)
 dnl we force mjpeg as it is now bundled
 AC_DEFINE(USE_MJPEG,1,[MJPEG])
-AC_DEFINE(AMR_NB,1,[AMR_NB])
-AC_DEFINE(CONFIG_AMR_NB,1,[AMR_NB])
 dnl AC_DEFINE(USE_MP3,0,[libmad])
 dnl AC_DEFINE(USE_MPEG,0,[libmpeg3])
 dnl AC_DEFINE(OSS_SUPPORT,0,[OSS])
@@ -179,6 +177,24 @@ dnl AC_DEFINE(USE_XX_XVID,0,[XVID_AS_XVI
 dnl AC_DEFINE(USE_DIVX,0,[DIVX is present])
 dnl ___________________________________
 
+dnl ___________________AMR____________
+
+AC_ARG_ENABLE(amr,
+	AC_HELP_STRING([--enable-amr_nb], [Compile amr-nb support]),
+	use_amr_nb=yes, use_amr_nb=no)
+
+AC_MSG_CHECKING([if amr_nb is enabled])
+AC_MSG_RESULT($use_amr_nb)
+
+if test "x$use_amr_nb" == "xyes"; then
+	AC_DEFINE(AMR_NB,1,[AMR_NB])
+	AC_DEFINE(CONFIG_AMR_NB,1,[AMR_NB])
+fi
+
+AM_CONDITIONAL(AMR_NB, test "x$use_amr_nb" == "xyes" )
+
+dnl __________________/amr____________
+
 dnl ____________________________________
 have_mad=yes
 have_divxdecore=yes
@@ -698,6 +714,23 @@ dnl __________________LAME______________
  
  
 
+dnl ___________________TOOLAME____________
+
+AC_ARG_ENABLE(toolame,
+	AC_HELP_STRING([--enable-toolame], [Compile toolame support]),
+	use_toolame=yes, use_toolame=no)
+
+AC_MSG_CHECKING([if toolame is enabled])
+AC_MSG_RESULT($use_toolame)
+
+if test "x$use_toolame" == "xyes"; then
+	AC_DEFINE(USE_TOOLAME,1,"[TOOLAME]")
+fi
+
+AM_CONDITIONAL(USE_TOOLAME, test "x$use_toolame" == "xyes" )
+
+dnl __________________/toolame____________
+
 dnl __________________/mad______________
 dnl __________________MJPEG______________
 dnl AC_CHECK_HEADERS(mjpegtools/jpegutils.h,,have_mjpeg=no)