Move distribution specific settings to Distributions/netbox3.mak.

diff --git a/extras/contrib/src/Distributions/netbox3.mak b/extras/contrib/src/Distributions/netbox3.mak
index aadcb6a1a005ca492dace6e5025e2752306d5712..7adc5ba2caf778ddb7cc8a8451059fc488530e21 100644 (file)
--- a/extras/contrib/src/Distributions/netbox3.mak
+++ b/extras/contrib/src/Distributions/netbox3.mak
@@ -1,5 +1,12 @@
+#
+# Fine tune ffmpeg's capabiities for this system
+#
+FFMPEGCONF += --disable-encoders --disable-muxers --disable-demuxers --enable-demuxer=avi --enable-demuxer=avisynth --enable-demuxer=gif --enable-demuxer=h261 --enable-demuxer=h263 --enable-demuxer=h264 --enable-demuxer=image2 --enable-demuxer=image2pipe --enable-demuxer=m4v --enable-demuxer=mjpg --enable-demuxer=mov --enable-demuxer=mpegps --enable-demuxer=mpegvideo --enable-demuxer=yuv4mpegpipe --disable-parsers --enable-parser=mpeg4video --enable-parser=vc1 --enable-parser=mjpeg --enable-parser=mpegaudio --enable-parser=mpegvideo --enable-parser=pnm --enable-parser=h264 --enable-parser=h263 --enable-parser=h264 --disable-decoders --enable-decoder=h261 --enable-decoder=h263 --enable-decoder=h263i --enable-decoder=h264 --enable-decoder=huffyuv --enable-decoder=idcin --enable-decoder=jpegls --enable-decoder=mjpeg --enable-decoder=mjpegb --enable-decoder=mmvideo --enable-decoder=mpeg1video --enable-decoder=mpeg2video --enable-decoder=mpeg4 --enable-decoder=mpeg4aac --enable-decoder=mpegvideo --enable-decoder=msmpeg4v1 --enable-decoder=msmpeg4v2 --enable-decoder=msmpeg4v3 --enable-decoder=msvideo1 --enable-decoder=png --enable-decoder=rv10 --enable-decoder=rv20 --enable-decoder=vc1 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=wmv1 --enable-decoder=wmv2 --enable-decoder=wmv3 --enable-decoder=zlib --enable-decoder=gif --enable-decoder=tiff  --disable-protocols
+
+#
 # NetBOX Linux rules
+#
 all: .iconv .intl .freetype .zlib \
        .ffmpeg .live .xml \
-       .dvbpsi
+       .dvbpsi .png
 

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index c986979d7a9478872e52a34591f19cfc032d0efc..56a84595bc099dbef9f00ae24e572589b8061d1d 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -133,7 +133,7 @@ FFMPEGCONF+= --arch=armeb --enable-armv5te --enable-iwmmxt
 else
 FFMPEGCONF+= --arch=armv4l
 endif
-FFMPEGCONF+= --enable-small --enable-pthreads --disable-debug --disable-encoders --disable-muxers --disable-demuxers --enable-demuxer=avi --enable-demuxer=avisynth --enable-demuxer=gif --enable-demuxer=h261 --enable-demuxer=h263 --enable-demuxer=h264 --enable-demuxer=image2 --enable-demuxer=image2pipe --enable-demuxer=m4v --enable-demuxer=mjpg --enable-demuxer=mov --enable-demuxer=mpegps --enable-demuxer=mpegvideo --enable-demuxer=yuv4mpegpipe --disable-parsers --enable-parser=mpeg4video --enable-parser=vc1 --enable-parser=mjpeg --enable-parser=mpegaudio --enable-parser=mpegvideo --enable-parser=pnm --enable-parser=h264 --enable-parser=h263 --enable-parser=h264 --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=ac3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-decoder=nellymoser --disable-protocols 
+FFMPEGCONF+= --enable-small --disable-debug --disable-mpegaudio-hp
 FFMPEG_CFLAGS += -DHAVE_LRINTF --std=c99
 else
 FFMPEGCONF+= --enable-libmp3lame --enable-libfaac --enable-liba52 --enable-swscaler