diff -Naur original/mjpegtools-1.4.1/Makefile patched/mjpegtools-1.4.1/Makefile
--- original/mjpegtools-1.4.1/Makefile	Wed Dec 31 18:00:00 1969
+++ patched/mjpegtools-1.4.1/Makefile	Mon Aug 27 15:56:21 2001
@@ -0,0 +1,395 @@
+# Generated automatically from Makefile.in by configure.
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Process with automake to produce Makefile.in
+
+
+SHELL = /bin/sh
+
+srcdir = .
+top_srcdir = .
+prefix = /usr/local
+exec_prefix = ${prefix}
+
+bindir = ${exec_prefix}/bin
+sbindir = ${exec_prefix}/sbin
+libexecdir = ${exec_prefix}/libexec
+datadir = ${prefix}/share
+sysconfdir = ${prefix}/etc
+sharedstatedir = ${prefix}/com
+localstatedir = ${prefix}/var
+libdir = ${exec_prefix}/lib
+infodir = ${prefix}/info
+mandir = ${prefix}/man
+includedir = ${prefix}/include
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/mjpegtools
+pkglibdir = $(libdir)/mjpegtools
+pkgincludedir = $(includedir)/mjpegtools
+
+top_builddir = .
+
+ACLOCAL = /Users/Shared/Projects/Unix/mjpegtools-1.4.1/missing aclocal
+AUTOCONF = autoconf
+AUTOMAKE = /Users/Shared/Projects/Unix/mjpegtools-1.4.1/missing automake
+AUTOHEADER = autoheader
+
+INSTALL = /usr/bin/install -c
+INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_SCRIPT = ${INSTALL_PROGRAM}
+transform = s,x,x,
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = powerpc-apple-darwin1.3.7
+host_triplet = powerpc-apple-darwin1.3.7
+AWK = awk
+CC = gcc
+FORMS_LIBS = 
+GLIB_CFLAGS = -I/usr/local/include/glib-1.2 -I/usr/local/lib/glib/include
+GLIB_CONFIG = /usr/local/bin/glib-config
+GLIB_LIBS = -L/usr/local/lib -lglib
+JPEG_CFLAGS = 
+JPEG_LIBS = -ljpeg
+LN_S = ln -s
+MAINT = #
+MAKEINFO = /Users/Shared/Projects/Unix/mjpegtools-1.4.1/missing makeinfo
+MOVTAR_CFLAGS = -I/usr/include -I/usr/local/include -I/usr/local/include/glib-1.2 -I/usr/local/lib/glib/include
+MOVTAR_CONFIG = /usr/local/bin/movtar-config
+MOVTAR_LIBS = -L/usr/local/lib -L/usr/local/lib -lglib -lmovtar
+MOVTAR_VERSION = 0.1.2
+NASM = 
+NASMFLAGS = 
+PACKAGE = mjpegtools
+PTHREAD_LIBS = -lpthread
+QUICKTIME_CFLAGS = -I /usr/local/src/quicktime4linux-1.3
+QUICKTIME_LIBS = -L/usr/local/src/quicktime4linux-1.3 -lquicktime  -L/usr/local/lib -lglib  -lpthread  -lpng -ldl
+RANLIB = ranlib
+SDL_CFLAGS = -I/usr/local/include -I/usr/local/include/SDL -D_THREAD_SAFE -F/System/Library/Frameworks/Carbon.framework
+SDL_CONFIG = /usr/local/bin/sdl-config
+SDL_LIBS = -L/usr/local/lib -lSDLmain -lSDL -framework OpenGL -framework AGL -framework Carbon
+V4LCONF_LIBS = 
+VERSION = 1.4.1
+X_CFLAGS =  -I/usr/X11R6/include
+X_EXTRA_LIBS = 
+X_LIBS =  -L/usr/X11R6/lib
+X_PRE_LIBS =  -lSM -lICE
+x_libraries = /usr/X11R6/lib
+
+SUBDIRS = utils lavtools aenc mplex mpeg2enc scripts docs
+
+#
+# Add any non autoconf'd files here, extra readmes and other misc 
+# info to be copied into the dist
+#
+EXTRA_DIST = HINTS README README.lavpipe README.transist TODO BUGS CHANGES mjpeg_howto.txt
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES = 
+DIST_COMMON =  README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
+Makefile.am Makefile.in NEWS TODO acconfig.h aclocal.m4 config.guess \
+config.h.in config.sub configure configure.in install-sh missing \
+mkinstalldirs
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: # Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+$(ACLOCAL_M4): # configure.in 
+	cd $(srcdir) && $(ACLOCAL)
+
+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+$(srcdir)/configure: #$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+	cd $(srcdir) && $(AUTOCONF)
+
+config.h: stamp-h
+	@if test ! -f $@; then \
+		rm -f stamp-h; \
+		$(MAKE) stamp-h; \
+	else :; fi
+stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
+	     $(SHELL) ./config.status
+	@echo timestamp > stamp-h 2> /dev/null
+$(srcdir)/config.h.in: #$(srcdir)/stamp-h.in
+	@if test ! -f $@; then \
+		rm -f $(srcdir)/stamp-h.in; \
+		$(MAKE) $(srcdir)/stamp-h.in; \
+	else :; fi
+$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
+	cd $(top_srcdir) && $(AUTOHEADER)
+	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
+
+mostlyclean-hdr:
+
+clean-hdr:
+
+distclean-hdr:
+	-rm -f config.h
+
+maintainer-clean-hdr:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+
+
+
+all-recursive install-data-recursive install-exec-recursive \
+installdirs-recursive install-recursive uninstall-recursive  \
+check-recursive installcheck-recursive info-recursive dvi-recursive:
+	@set fnord $(MAKEFLAGS); amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@set fnord $(MAKEFLAGS); amf=$$2; \
+	dot_seen=no; \
+	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+	  rev="$$subdir $$rev"; \
+	  test "$$subdir" = "." && dot_seen=yes; \
+	done; \
+	test "$$dot_seen" = "no" && rev=". $$rev"; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $$unique $(LISP)
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+   if test "$$subdir" = .; then :; else \
+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+   fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+	-rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	-rm -rf $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
+	mkdir $(distdir)/=build
+	mkdir $(distdir)/=inst
+	dc_install_base=`cd $(distdir)/=inst && pwd`; \
+	cd $(distdir)/=build \
+	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist
+	-rm -rf $(distdir)
+	@banner="$(distdir).tar.gz is ready for distribution"; \
+	dashes=`echo "$$banner" | sed s/./=/g`; \
+	echo "$$dashes"; \
+	echo "$$banner"; \
+	echo "$$dashes"
+dist: distdir
+	-chmod -R a+r $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+	-rm -rf $(distdir)
+dist-all: distdir
+	-chmod -R a+r $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+	-rm -rf $(distdir)
+distdir: $(DISTFILES)
+	-rm -rf $(distdir)
+	mkdir $(distdir)
+	-chmod 777 $(distdir)
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+	for subdir in $(SUBDIRS); do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d $(distdir)/$$subdir \
+	    || mkdir $(distdir)/$$subdir \
+	    || exit 1; \
+	    chmod 777 $(distdir)/$$subdir; \
+	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+info-am:
+info: info-recursive
+dvi-am:
+dvi: dvi-recursive
+check-am: all-am
+check: check-recursive
+installcheck-am:
+installcheck: installcheck-recursive
+all-recursive-am: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+install-exec-am:
+install-exec: install-exec-recursive
+
+install-data-am:
+install-data: install-data-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-recursive
+uninstall-am:
+uninstall: uninstall-recursive
+all-am: Makefile config.h
+all-redirect: all-recursive-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs: installdirs-recursive
+installdirs-am:
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
+
+mostlyclean: mostlyclean-recursive
+
+clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
+
+clean: clean-recursive
+
+distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
+
+distclean: distclean-recursive
+	-rm -f config.status
+
+maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
+		maintainer-clean-generic distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f config.status
+
+.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
+install-data-recursive uninstall-data-recursive install-exec-recursive \
+uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
+all-recursive check-recursive installcheck-recursive info-recursive \
+dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
+distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
+install-exec-am install-exec install-data-am install-data install-am \
+install uninstall-am uninstall all-redirect all-am all installdirs-am \
+installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+rpm: Makefile
+	$(MAKE) dist
+	rpm -ta --clean $(PACKAGE)-$(VERSION).tar.gz
+
+deb: 
+	mkdir debian/tmp
+	dpkg-buildpackage -rfakeroot
+	rm -r debian/tmp
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Naur original/mjpegtools-1.4.1/Makefile.am patched/mjpegtools-1.4.1/Makefile.am
--- original/mjpegtools-1.4.1/Makefile.am	Tue Jun  5 12:13:13 2001
+++ patched/mjpegtools-1.4.1/Makefile.am	Mon Aug 27 15:56:21 2001
@@ -1,6 +1,6 @@
 # Process with automake to produce Makefile.in
 
-SUBDIRS    = utils mjpeg lavtools aenc mplex mpeg2enc scripts docs
+SUBDIRS    = utils lavtools aenc mplex mpeg2enc scripts docs
 
 #
 # Add any non autoconf'd files here, extra readmes and other misc 
diff -Naur original/mjpegtools-1.4.1/Makefile.in patched/mjpegtools-1.4.1/Makefile.in
--- original/mjpegtools-1.4.1/Makefile.in	Mon Jun 25 02:18:03 2001
+++ patched/mjpegtools-1.4.1/Makefile.in	Mon Aug 27 15:56:21 2001
@@ -94,7 +94,7 @@
 X_PRE_LIBS = @X_PRE_LIBS@
 x_libraries = @x_libraries@
 
-SUBDIRS = utils mjpeg lavtools aenc mplex mpeg2enc scripts docs
+SUBDIRS = utils lavtools aenc mplex mpeg2enc scripts docs
 
 #
 # Add any non autoconf'd files here, extra readmes and other misc 
diff -Naur original/mjpegtools-1.4.1/aenc/Makefile patched/mjpegtools-1.4.1/aenc/Makefile
--- original/mjpegtools-1.4.1/aenc/Makefile	Wed Dec 31 18:00:00 1969
+++ patched/mjpegtools-1.4.1/aenc/Makefile	Mon Aug 27 15:56:19 2001
@@ -0,0 +1,327 @@
+# Generated automatically from Makefile.in by configure.
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Process this file with automake to produce Makefile.in
+
+
+SHELL = /bin/sh
+
+srcdir = .
+top_srcdir = ..
+prefix = /usr/local
+exec_prefix = ${prefix}
+
+bindir = ${exec_prefix}/bin
+sbindir = ${exec_prefix}/sbin
+libexecdir = ${exec_prefix}/libexec
+datadir = ${prefix}/share
+sysconfdir = ${prefix}/etc
+sharedstatedir = ${prefix}/com
+localstatedir = ${prefix}/var
+libdir = ${exec_prefix}/lib
+infodir = ${prefix}/info
+mandir = ${prefix}/man
+includedir = ${prefix}/include
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/mjpegtools
+pkglibdir = $(libdir)/mjpegtools
+pkgincludedir = $(includedir)/mjpegtools
+
+top_builddir = ..
+
+ACLOCAL = /Users/Shared/Projects/Unix/mjpegtools-1.4.1/missing aclocal
+AUTOCONF = autoconf
+AUTOMAKE = /Users/Shared/Projects/Unix/mjpegtools-1.4.1/missing automake
+AUTOHEADER = autoheader
+
+INSTALL = /usr/bin/install -c
+INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_SCRIPT = ${INSTALL_PROGRAM}
+transform = s,x,x,
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = powerpc-apple-darwin1.3.7
+host_triplet = powerpc-apple-darwin1.3.7
+AWK = awk
+CC = gcc
+FORMS_LIBS = 
+GLIB_CFLAGS = -I/usr/local/include/glib-1.2 -I/usr/local/lib/glib/include
+GLIB_CONFIG = /usr/local/bin/glib-config
+GLIB_LIBS = -L/usr/local/lib -lglib
+JPEG_CFLAGS = 
+JPEG_LIBS = -ljpeg
+LN_S = ln -s
+MAINT = #
+MAKEINFO = /Users/Shared/Projects/Unix/mjpegtools-1.4.1/missing makeinfo
+MOVTAR_CFLAGS = -I/usr/include -I/usr/local/include -I/usr/local/include/glib-1.2 -I/usr/local/lib/glib/include
+MOVTAR_CONFIG = /usr/local/bin/movtar-config
+MOVTAR_LIBS = -L/usr/local/lib -L/usr/local/lib -lglib -lmovtar
+MOVTAR_VERSION = 0.1.2
+NASM = 
+NASMFLAGS = 
+PACKAGE = mjpegtools
+PTHREAD_LIBS = -lpthread
+QUICKTIME_CFLAGS = -I /usr/local/src/quicktime4linux-1.3
+QUICKTIME_LIBS = -L/usr/local/src/quicktime4linux-1.3 -lquicktime  -L/usr/local/lib -lglib  -lpthread  -lpng -ldl
+RANLIB = ranlib
+SDL_CFLAGS = -I/usr/local/include -I/usr/local/include/SDL -D_THREAD_SAFE -F/System/Library/Frameworks/Carbon.framework
+SDL_CONFIG = /usr/local/bin/sdl-config
+SDL_LIBS = -L/usr/local/lib -lSDLmain -lSDL -framework OpenGL -framework AGL -framework Carbon
+V4LCONF_LIBS = 
+VERSION = 1.4.1
+X_CFLAGS =  -I/usr/X11R6/include
+X_EXTRA_LIBS = 
+X_LIBS =  -L/usr/X11R6/lib
+X_PRE_LIBS =  -lSM -lICE
+x_libraries = /usr/X11R6/lib
+
+INCLUDES = -I $(top_srcdir) -I $(top_srcdir)/utils
+
+bin_PROGRAMS = mp2enc
+mp2enc_SOURCES = musicin.c common.c encode.c subs.c psy.c tonal.c 	tables.c wav_io.c fft.c 	common.h table_absthr.h table_cb.h  table_th.h 	encoder.h  table_alloc.h   table_enwindow.h  wav_io.h
+
+
+mp2enc_LDADD = $(top_srcdir)/utils/libutils.a -lm
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = ../config.h
+CONFIG_CLEAN_FILES = 
+PROGRAMS =  $(bin_PROGRAMS)
+
+
+DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
+CPPFLAGS = 
+LDFLAGS = 
+LIBS = -lz
+mp2enc_OBJECTS =  musicin.o common.o encode.o subs.o psy.o tonal.o \
+tables.o wav_io.o fft.o
+mp2enc_DEPENDENCIES = 
+mp2enc_LDFLAGS = 
+CFLAGS =  -g -O2 -Wall -Wunused
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+DIST_COMMON =  README Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+SOURCES = $(mp2enc_SOURCES)
+OBJECTS = $(mp2enc_OBJECTS)
+
+all: all-redirect
+.SUFFIXES:
+.SUFFIXES: .S .c .o .s
+$(srcdir)/Makefile.in: # Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps aenc/Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+mostlyclean-binPROGRAMS:
+
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
+distclean-binPROGRAMS:
+
+maintainer-clean-binPROGRAMS:
+
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  else :; fi; \
+	done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	done
+
+.c.o:
+	$(COMPILE) -c $<
+
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
+	$(COMPILE) -c $<
+
+mostlyclean-compile:
+	-rm -f *.o core *.core
+
+clean-compile:
+
+distclean-compile:
+	-rm -f *.tab.c
+
+maintainer-clean-compile:
+
+mp2enc: $(mp2enc_OBJECTS) $(mp2enc_DEPENDENCIES)
+	@rm -f mp2enc
+	$(LINK) $(mp2enc_LDFLAGS) $(mp2enc_OBJECTS) $(mp2enc_LDADD) $(LIBS)
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $$unique $(LISP)
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+	-rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = aenc
+
+distdir: $(DISTFILES)
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+common.o: common.c common.h ../utils/mjpeg_logging.h \
+	../utils/mjpeg_types.h
+encode.o: encode.c ../config.h common.h ../utils/mjpeg_logging.h \
+	../utils/mjpeg_types.h encoder.h
+fft.o: fft.c
+musicin.o: musicin.c common.h ../utils/mjpeg_logging.h \
+	../utils/mjpeg_types.h encoder.h wav_io.h
+psy.o: psy.c common.h ../utils/mjpeg_logging.h ../utils/mjpeg_types.h \
+	encoder.h
+subs.o: subs.c common.h ../utils/mjpeg_logging.h ../utils/mjpeg_types.h \
+	encoder.h
+tables.o: tables.c common.h ../utils/mjpeg_logging.h \
+	../utils/mjpeg_types.h encoder.h table_alloc.h table_enwindow.h \
+	table_absthr.h table_cb.h table_th.h
+tonal.o: tonal.c common.h ../utils/mjpeg_logging.h \
+	../utils/mjpeg_types.h encoder.h
+wav_io.o: wav_io.c ../utils/mjpeg_logging.h ../utils/mjpeg_types.h \
+	wav_io.h
+
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am: install-binPROGRAMS
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am: uninstall-binPROGRAMS
+uninstall: uninstall-am
+all-am: Makefile $(PROGRAMS)
+all-redirect: all-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+	$(mkinstalldirs)  $(DESTDIR)$(bindir)
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
+		mostlyclean-tags mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-binPROGRAMS clean-compile clean-tags clean-generic \
+		mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-binPROGRAMS distclean-compile distclean-tags \
+		distclean-generic clean-am
+
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-binPROGRAMS \
+		maintainer-clean-compile maintainer-clean-tags \
+		maintainer-clean-generic distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
+maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
+mostlyclean-compile distclean-compile clean-compile \
+maintainer-clean-compile tags mostlyclean-tags distclean-tags \
+clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+check-am installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Naur original/mjpegtools-1.4.1/aenc/Makefile.am patched/mjpegtools-1.4.1/aenc/Makefile.am
--- original/mjpegtools-1.4.1/aenc/Makefile.am	Sat May 12 03:08:29 2001
+++ patched/mjpegtools-1.4.1/aenc/Makefile.am	Mon Aug 27 15:56:19 2001
@@ -8,5 +8,5 @@
 	common.h table_absthr.h table_cb.h  table_th.h \
 	encoder.h  table_alloc.h   table_enwindow.h  wav_io.h
 
-mp2enc_LDADD = -L$(top_srcdir)/utils -lutils -lm
+mp2enc_LDADD = $(top_srcdir)/utils/libutils.a -lm
 
diff -Naur original/mjpegtools-1.4.1/aenc/Makefile.in patched/mjpegtools-1.4.1/aenc/Makefile.in
--- original/mjpegtools-1.4.1/aenc/Makefile.in	Mon Jun 25 02:18:07 2001
+++ patched/mjpegtools-1.4.1/aenc/Makefile.in	Mon Aug 27 15:56:19 2001
@@ -100,7 +100,7 @@
 mp2enc_SOURCES = musicin.c common.c encode.c subs.c psy.c tonal.c 	tables.c wav_io.c fft.c 	common.h table_absthr.h table_cb.h  table_th.h 	encoder.h  table_alloc.h   table_enwindow.h  wav_io.h
 
 
-mp2enc_LDADD = -L$(top_srcdir)/utils -lutils -lm
+mp2enc_LDADD = $(top_srcdir)/utils/libutils.a -lm
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
diff -Naur original/mjpegtools-1.4.1/bs.h patched/mjpegtools-1.4.1/bs.h
--- original/mjpegtools-1.4.1/bs.h	Wed Dec 31 18:00:00 1969
+++ patched/mjpegtools-1.4.1/bs.h	Mon Aug 27 15:56:21 2001
@@ -0,0 +1,12 @@
+                #if defined(WORDS_BIGENDIAN)
+                #define bswap_16(x) \
+                     ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8))
+                #define bswap_32(x) \
+                     ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) |
+ \ 
+                    (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
+                #else
+                #define bswap_16(x) (x)
+                #define bswap_32(x) (x)
+                #endif
+
diff -Naur original/mjpegtools-1.4.1/confdefs.h patched/mjpegtools-1.4.1/confdefs.h
--- original/mjpegtools-1.4.1/confdefs.h	Wed Dec 31 18:00:00 1969
+++ patched/mjpegtools-1.4.1/confdefs.h	Mon Aug 27 15:56:21 2001
@@ -0,0 +1 @@
+#define VERSION ${VERSION}
diff -Naur original/mjpegtools-1.4.1/config.cache patched/mjpegtools-1.4.1/config.cache
--- original/mjpegtools-1.4.1/config.cache	Wed Dec 31 18:00:00 1969
+++ patched/mjpegtools-1.4.1/config.cache	Mon Aug 27 15:56:20 2001
@@ -0,0 +1,48 @@
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs.  It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# By default, configure uses ./config.cache as the cache file,
+# creating it if it does not exist already.  You can give configure
+# the --cache-file=FILE option to use a different cache file; that is
+# what configure does when it calls configure scripts in
+# subdirectories, so they share the cache.
+# Giving --cache-file=/dev/null disables caching, for debugging configure.
+# config.status only pays attention to the cache file if you give it the
+# --recheck option to rerun configure.
+#
+ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}
+ac_cv_c_const=${ac_cv_c_const=yes}
+ac_cv_c_inline=${ac_cv_c_inline=inline}
+ac_cv_func_connect=${ac_cv_func_connect=yes}
+ac_cv_func_gethostbyname=${ac_cv_func_gethostbyname=yes}
+ac_cv_func_pthread_attr_getstacksize=${ac_cv_func_pthread_attr_getstacksize=yes}
+ac_cv_func_remove=${ac_cv_func_remove=yes}
+ac_cv_func_shmat=${ac_cv_func_shmat=yes}
+ac_cv_have_x=${ac_cv_have_x='have_x=yes 		ac_x_includes=/usr/X11R6/include ac_x_libraries=/usr/X11R6/lib'}
+ac_cv_header_fenv_h=${ac_cv_header_fenv_h=no}
+ac_cv_lib_ICE_IceConnectionNumber=${ac_cv_lib_ICE_IceConnectionNumber=yes}
+ac_cv_lib_Xxf86dga_XF86DGAQueryExtension=${ac_cv_lib_Xxf86dga_XF86DGAQueryExtension=yes}
+ac_cv_lib_dnet_dnet_ntoa=${ac_cv_lib_dnet_dnet_ntoa=no}
+ac_cv_lib_dnet_stub_dnet_ntoa=${ac_cv_lib_dnet_stub_dnet_ntoa=no}
+ac_cv_lib_forms_fl_initialize=${ac_cv_lib_forms_fl_initialize=no}
+ac_cv_lib_jpeg_jpeg_start_compress=${ac_cv_lib_jpeg_jpeg_start_compress=yes}
+ac_cv_lib_jpeg_mmx_jpeg_start_compress=${ac_cv_lib_jpeg_mmx_jpeg_start_compress=no}
+ac_cv_lib_png_png_read_info=${ac_cv_lib_png_png_read_info=yes}
+ac_cv_lib_pthread_pthread_create=${ac_cv_lib_pthread_pthread_create=yes}
+ac_cv_lib_quicktime_quicktime_open=${ac_cv_lib_quicktime_quicktime_open=yes}
+ac_cv_path_GLIB_CONFIG=${ac_cv_path_GLIB_CONFIG=/usr/local/bin/glib-config}
+ac_cv_path_MOVTAR_CONFIG=${ac_cv_path_MOVTAR_CONFIG=/usr/local/bin/movtar-config}
+ac_cv_path_SDL_CONFIG=${ac_cv_path_SDL_CONFIG=/usr/local/bin/sdl-config}
+ac_cv_path_install=${ac_cv_path_install='/usr/bin/install -c'}
+ac_cv_prog_AWK=${ac_cv_prog_AWK=awk}
+ac_cv_prog_CC=${ac_cv_prog_CC=gcc}
+ac_cv_prog_CPP=${ac_cv_prog_CPP='gcc -E -traditional-cpp'}
+ac_cv_prog_LN_S=${ac_cv_prog_LN_S='ln -s'}
+ac_cv_prog_RANLIB=${ac_cv_prog_RANLIB=ranlib}
+ac_cv_prog_cc_cross=${ac_cv_prog_cc_cross=no}
+ac_cv_prog_cc_g=${ac_cv_prog_cc_g=yes}
+ac_cv_prog_cc_works=${ac_cv_prog_cc_works=yes}
+ac_cv_prog_gcc=${ac_cv_prog_gcc=yes}
+ac_cv_prog_make_make_set=${ac_cv_prog_make_make_set=yes}
diff -Naur original/mjpegtools-1.4.1/config.guess patched/mjpegtools-1.4.1/config.guess
--- original/mjpegtools-1.4.1/config.guess	Sat Mar 11 03:25:38 2000
+++ patched/mjpegtools-1.4.1/config.guess	Mon Aug 27 15:56:20 2001
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
 #   Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify it
@@ -23,8 +23,7 @@
 # the same distribution terms that you use for the rest of that program.
 
 # Written by Per Bothner <bothner@cygnus.com>.
-# The master version of this file is at the FSF in /home/gd/gnu/lib.
-# Please send patches to the Autoconf mailing list <autoconf@gnu.org>.
+# Please send patches to <config-patches@gnu.org>.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -68,6 +67,43 @@
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# Netbsd (nbsd) targets should (where applicable) match one or
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	# Determine the machine/vendor (is the vendor relevant).
+	case "${UNAME_MACHINE}" in
+	    amiga) machine=m68k-cbm ;;
+	    arm32) machine=arm-unknown ;;
+	    atari*) machine=m68k-atari ;;
+	    sun3*) machine=m68k-sun ;;
+	    mac68k) machine=m68k-apple ;;
+	    macppc) machine=powerpc-apple ;;
+	    hp3[0-9][05]) machine=m68k-hp ;;
+	    ibmrt|romp-ibm) machine=romp-ibm ;;
+	    *) machine=${UNAME_MACHINE}-unknown ;;
+	esac
+	# The Operating System including object format.
+	if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep __ELF__ >/dev/null
+	then
+	    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+	    # Return netbsd for either.  FIX?
+	    os=netbsd
+	else
+	    os=netbsdelf
+	fi
+	# The OS release
+	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit 0 ;;
     alpha:OSF1:*:*)
 	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -77,41 +113,51 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	cat <<EOF >$dummy.s
+	.data
+\$Lformat:
+	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+
+	.text
 	.globl main
+	.align 4
 	.ent main
 main:
-	.frame \$30,0,\$26,0
-	.prologue 0
-	.long 0x47e03d80 # implver $0
-	lda \$2,259
-	.long 0x47e20c21 # amask $2,$1
-	srl \$1,8,\$2
-	sll \$2,2,\$2
-	sll \$0,3,\$0
-	addl \$1,\$0,\$0
-	addl \$2,\$0,\$0
-	ret \$31,(\$26),1
+	.frame \$30,16,\$26,0
+	ldgp \$29,0(\$27)
+	.prologue 1
+	.long 0x47e03d80 # implver \$0
+	lda \$2,-1
+	.long 0x47e20c21 # amask \$2,\$1
+	lda \$16,\$Lformat
+	mov \$0,\$17
+	not \$1,\$18
+	jsr \$26,printf
+	ldgp \$29,0(\$26)
+	mov 0,\$16
+	jsr \$26,exit
 	.end main
 EOF
 	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 	if test "$?" = 0 ; then
-		./$dummy
-		case "$?" in
-			7)
+		case `./$dummy` in
+			0-0)
 				UNAME_MACHINE="alpha"
 				;;
-			15)
+			1-0)
 				UNAME_MACHINE="alphaev5"
 				;;
-			14)
+			1-1)
 				UNAME_MACHINE="alphaev56"
 				;;
-			10)
+			1-101)
 				UNAME_MACHINE="alphapca56"
 				;;
-			16)
+			2-303)
 				UNAME_MACHINE="alphaev6"
 				;;
+			2-307)
+				UNAME_MACHINE="alphaev67"
+				;;
 		esac
 	fi
 	rm -f $dummy.s $dummy
@@ -129,9 +175,6 @@
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-cbm-sysv4
 	exit 0;;
-    amiga:NetBSD:*:*)
-      echo m68k-cbm-netbsd${UNAME_RELEASE}
-      exit 0 ;;
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -156,12 +199,12 @@
     wgrisc:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
-    arm32:NetBSD:*:*)
-	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
     SR2?01:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
 	exit 0;;
@@ -218,15 +261,12 @@
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
 	exit 0 ;;
-    atari*:NetBSD:*:*)
-	echo m68k-atari-netbsd${UNAME_RELEASE}
-	exit 0 ;;
     atari*:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor 
+    # "atarist" or "atariste" at least should have a processor
     # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
     # to the lowercase version "mint" (or "freemint").  Finally
     # the system name "TOS" denotes a system which is actually not
@@ -250,15 +290,9 @@
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
-    sun3*:NetBSD:*:*)
-	echo m68k-sun-netbsd${UNAME_RELEASE}
-	exit 0 ;;
     sun3*:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    mac68k:NetBSD:*:*)
-	echo m68k-apple-netbsd${UNAME_RELEASE}
-	exit 0 ;;
     mac68k:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -271,9 +305,6 @@
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
-    macppc:NetBSD:*:*)
-        echo powerpc-apple-netbsd${UNAME_RELEASE}
-        exit 0 ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
 	exit 0 ;;
@@ -289,6 +320,7 @@
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	sed 's/^	//' << EOF >$dummy.c
 #ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
 	int main (int argc, char *argv[]) {
 #else
 	int main (argc, argv) int argc; char *argv[]; {
@@ -328,15 +360,18 @@
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
-        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
-	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
-	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
 		echo m88k-dg-dgux${UNAME_RELEASE}
-	else
+	    else
 		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
-        else echo i586-dg-dgux${UNAME_RELEASE}
-        fi
  	exit 0 ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
@@ -402,7 +437,7 @@
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
 	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
 	exit 0 ;;                           # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
@@ -423,6 +458,8 @@
 	    9000/[34]?? )         HP_ARCH=m68k ;;
 	    9000/[678][0-9][0-9])
               sed 's/^              //' << EOF >$dummy.c
+
+              #define _HPUX_SOURCE
               #include <stdlib.h>
               #include <unistd.h>
 
@@ -453,7 +490,7 @@
                   exit (0);
               }
 EOF
-	($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
 	rm -f $dummy.c $dummy
 	esac
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
@@ -547,10 +584,13 @@
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
 	exit 0 ;;
     CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE}
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY*T3E:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE}
+	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY-2:*:*:*)
 	echo cray2-cray-unicos
@@ -563,13 +603,10 @@
     F301:UNIX_System_V:*:*)
        echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
        exit 0 ;;
-    hp3[0-9][05]:NetBSD:*:*)
-	echo m68k-hp-netbsd${UNAME_RELEASE}
-	exit 0 ;;
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
+    i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     sparc*:BSD/OS:*:*)
@@ -579,17 +616,8 @@
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     *:FreeBSD:*:*)
-	if test -x /usr/bin/objformat; then
-	    if test "elf" = "`/usr/bin/objformat`"; then
-		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
-		exit 0
-	    fi
-	fi
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
-    *:NetBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
     *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	exit 0 ;;
@@ -618,12 +646,6 @@
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
     *:Linux:*:*)
-	# uname on the ARM produces all sorts of strangeness, and we need to
-	# filter it out.
-	case "$UNAME_MACHINE" in
-	  armv*)		      UNAME_MACHINE=$UNAME_MACHINE ;;
-	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
-	esac
 
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -636,12 +658,42 @@
 				    s/ .*//
 				    p'`
         case "$ld_supported_emulations" in
-	  *ia64)      echo "${UNAME_MACHINE}-unknown-linux"         ; exit 0 ;;
-	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
-	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
-	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  *ia64)
+		echo "${UNAME_MACHINE}-unknown-linux"
+		exit 0
+		;;
+	  i?86linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit 0
+		;;
+	  elf_i?86)
+		echo "${UNAME_MACHINE}-pc-linux"
+		exit 0
+		;;
+	  i?86coff)
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		exit 0
+		;;
+	  sparclinux)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+		exit 0
+		;;
+	  armlinux)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+		exit 0
+		;;
+	  elf32arm*)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuoldld"
+		exit 0
+		;;
+	  armelf_linux*)
+		echo "${UNAME_MACHINE}-unknown-linux-gnu"
+		exit 0
+		;;
+	  m68klinux)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+		exit 0
+		;;
 	  elf32ppc | elf32ppclinux)
 		# Determine Lib Version
 		cat >$dummy.c <<EOF
@@ -669,49 +721,61 @@
 			if test "$?" = 0 ; then
 				LIBC="libc1"
 			fi
-		fi	
+		fi
 		rm -f $dummy.c $dummy
-		echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;;
+		echo powerpc-unknown-linux-gnu${LIBC}
+		exit 0
+		;;
 	esac
 
 	if test "${UNAME_MACHINE}" = "alpha" ; then
-		sed 's/^	//'  <<EOF >$dummy.s
-		.globl main
-		.ent main
-	main:
-		.frame \$30,0,\$26,0
-		.prologue 0
-		.long 0x47e03d80 # implver $0
-		lda \$2,259
-		.long 0x47e20c21 # amask $2,$1
-		srl \$1,8,\$2
-		sll \$2,2,\$2
-		sll \$0,3,\$0
-		addl \$1,\$0,\$0
-		addl \$2,\$0,\$0
-		ret \$31,(\$26),1
-		.end main
+		cat <<EOF >$dummy.s
+			.data
+		\$Lformat:
+			.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+
+			.text
+			.globl main
+			.align 4
+			.ent main
+		main:
+			.frame \$30,16,\$26,0
+			ldgp \$29,0(\$27)
+			.prologue 1
+			.long 0x47e03d80 # implver \$0
+			lda \$2,-1
+			.long 0x47e20c21 # amask \$2,\$1
+			lda \$16,\$Lformat
+			mov \$0,\$17
+			not \$1,\$18
+			jsr \$26,printf
+			ldgp \$29,0(\$26)
+			mov 0,\$16
+			jsr \$26,exit
+			.end main
 EOF
 		LIBC=""
 		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 		if test "$?" = 0 ; then
-			./$dummy
-			case "$?" in
-			7)
+			case `./$dummy` in
+			0-0)
 				UNAME_MACHINE="alpha"
 				;;
-			15)
+			1-0)
 				UNAME_MACHINE="alphaev5"
 				;;
-			14)
+			1-1)
 				UNAME_MACHINE="alphaev56"
 				;;
-			10)
+			1-101)
 				UNAME_MACHINE="alphapca56"
 				;;
-			16)
+			2-303)
 				UNAME_MACHINE="alphaev6"
 				;;
+			2-307)
+				UNAME_MACHINE="alphaev67"
+				;;
 			esac
 
 			objdump --private-headers $dummy | \
@@ -725,6 +789,7 @@
 	elif test "${UNAME_MACHINE}" = "mips" ; then
 	  cat >$dummy.c <<EOF
 #ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
 	int main (int argc, char *argv[]) {
 #else
 	int main (argc, argv) int argc; char *argv[]; {
@@ -740,6 +805,8 @@
 EOF
 	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
 	  rm -f $dummy.c $dummy
+	elif test "${UNAME_MACHINE}" = "s390"; then
+	  echo s390-ibm-linux && exit 0
 	else
 	  # Either a pre-BFD a.out linker (linux-gnuoldld)
 	  # or one that does not give us useful --help.
@@ -761,6 +828,7 @@
 	  cat >$dummy.c <<EOF
 #include <features.h>
 #ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
 	int main (int argc, char *argv[]) {
 #else
 	int main (argc, argv) int argc; char *argv[]; {
@@ -798,19 +866,21 @@
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit 0 ;;
     i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
 	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
 	exit 0 ;;
     i?86:*:5:7*)
-	UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-	(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-	(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586
-	(/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686
-	(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
+        # Fixed at (any) Pentium or better
+        UNAME_MACHINE=i586
+        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
+	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
+	else
+	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+	fi
 	exit 0 ;;
     i?86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
@@ -830,7 +900,11 @@
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
+    i?86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit 0 ;;
     pc:*:*:*)
+	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
@@ -943,6 +1017,27 @@
 	exit 0 ;;
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
+    *:Darwin:*:*)
+	echo `uname -p`-apple-darwin${UNAME_RELEASE}
+	exit 0 ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	if test "${UNAME_MACHINE}" = "x86pc"; then
+		UNAME_MACHINE=pc
+	fi
+	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
+	exit 0 ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit 0 ;;
+    NSR-W:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit 0 ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit 0 ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
 	exit 0 ;;
 esac
 
diff -Naur original/mjpegtools-1.4.1/config.h patched/mjpegtools-1.4.1/config.h
--- original/mjpegtools-1.4.1/config.h	Wed Dec 31 18:00:00 1969
+++ patched/mjpegtools-1.4.1/config.h	Mon Aug 27 15:56:20 2001
@@ -0,0 +1,75 @@
+/* config.h.  Generated automatically by configure.  */
+/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+#define _GNU_SOURCE 1			/* We make some use of C9X and POSIX and GNU
+								 facilities... */
+
+
+
+/* Define to empty if the keyword does not work.  */
+/* #undef const */
+
+/* Define as __inline if that's what the C compiler calls it.  */
+/* #undef inline */
+
+/* Define if your processor stores words with the most significant
+   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
+#define WORDS_BIGENDIAN 1
+
+/* Define if the X Window System is missing or not being used.  */
+/* #undef X_DISPLAY_MISSING */
+
+#define VERSION   "1.4.1"  /* Mjpeg tools release version */
+
+/* Lagre file support ? */
+/* #undef _FILE_OFFSET_BITS */
+
+/* Define pthread lib stack size */
+#define HAVE_PTHREADSTACKSIZE 1
+
+/* Define if the installed GCC tool chain can generate MMX instructions */
+/* #undef HAVE_ASM_MMX */
+
+/* Define if the installed GCC tool-chain can generate 3DNow instructions */
+/* #undef HAVE_ASM_3DNOW */
+
+/* Define if the nasm assembler is available */
+/* #undef HAVE_ASM_NASM */
+
+/* Define if the libpthread library is present */
+#define HAVE_LIBPTHREAD 1
+
+/* Define if the quicktime for linux library is present */
+#define HAVE_LIBQUICKTIME 1
+
+/* Define if the libXxf86dga library is available */
+#define HAVE_LIBXXF86DGA 1
+
+/* Define if the libmovtar library is available */
+#define HAVE_LIBMOVTAR 1
+
+/* Define for availability of CMOV instruction (P6, P7 and  Athlon cores).*/
+/* #undef HAVE_CMOV */
+
+/* Define for an Intel based CPU */
+/* #undef HAVE_X86CPU */  
+
+/* Define for software MJPEG playback */
+#define BUILD_MJPEG 1
+
+/* Define if you have the <fenv.h> header file.  */
+/* #undef HAVE_FENV_H */
+
+/* Name of package */
+#define PACKAGE "mjpegtools"
+
+/* Version number of package */
+#define VERSION "1.4.1"
+
+#if defined(WORDS_BIGENDIAN)
+#define bswap_16(x) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8))
+#define bswap_32(x) ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
+#else
+#define bswap_16(x) (x)
+#define bswap_32(x) (x)
+#endif
+
diff -Naur original/mjpegtools-1.4.1/config.h.in patched/mjpegtools-1.4.1/config.h.in
--- original/mjpegtools-1.4.1/config.h.in	Tue Jun  5 14:23:43 2001
+++ patched/mjpegtools-1.4.1/config.h.in	Mon Aug 27 15:56:20 2001
@@ -64,3 +64,11 @@
 /* Version number of package */
 #undef VERSION
 
+#if defined(WORDS_BIGENDIAN)
+#define bswap_16(x) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8))
+#define bswap_32(x) ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
+#else
+#define bswap_16(x) (x)
+#define bswap_32(x) (x)
+#endif
+
diff -Naur original/mjpegtools-1.4.1/config.log patched/mjpegtools-1.4.1/config.log
--- original/mjpegtools-1.4.1/config.log	Wed Dec 31 18:00:00 1969
+++ patched/mjpegtools-1.4.1/config.log	Mon Aug 27 15:56:20 2001
@@ -0,0 +1,60 @@
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+configure:597: checking for a BSD compatible install
+configure:650: checking whether build environment is sane
+configure:707: checking whether make sets ${MAKE}
+configure:753: checking for working aclocal
+configure:766: checking for working autoconf
+configure:779: checking for working automake
+configure:792: checking for working autoheader
+configure:805: checking for working makeinfo
+configure:819: checking whether to enable maintainer-specific portions of Makefiles
+configure:848: checking host system type
+configure:923: checking for mawk
+configure:955: checking for gcc
+configure:1068: checking whether the C compiler (gcc -g -O2 ) works
+configure:1084: gcc -o conftest -g -O2   conftest.c -lz 1>&5
+configure:1110: checking whether the C compiler (gcc -g -O2 ) is a cross-compiler
+configure:1115: checking whether we are using GNU C
+configure:1143: checking whether gcc accepts -g
+configure:1186: checking for a BSD compatible install
+configure:1239: checking whether ln -s works
+configure:1262: checking for ranlib
+configure:1290: checking how to run the C preprocessor
+configure:1373: checking for fenv.h
+configure:1412: checking whether byte ordering is bigendian
+configure:1502: checking for working const
+configure:1577: checking for inline
+configure:1679: checking for glib-config
+configure:1714: checking for GLIB - version >= 1.2.0
+configure:1813: gcc -o conftest -g -O2 -I/usr/local/include/glib-1.2 -I/usr/local/lib/glib/include   conftest.c -L/usr/local/lib -lglib -lz 1>&5
+configure:1899: checking for pthread_create in -lpthread
+configure:1945: checking for pthread_attr_getstacksize
+configure:2020: checking for jpeg_start_compress in -ljpeg-mmx
+configure:2066: checking for jpeg_start_compress in -ljpeg
+configure:2147: checking for movtar-config
+configure:2203: checking for mawk
+configure:2269: checking for movtar - version >= 0.0.2
+configure:2325: checking for png_read_info in -lpng
+configure:2372: checking for quicktime_open in -lquicktime
+configure:2428: checking for X
+configure:2742: checking for dnet_ntoa in -ldnet
+configure:2783: checking for dnet_ntoa in -ldnet_stub
+configure:2831: checking for gethostbyname
+configure:2929: checking for connect
+configure:3021: checking for remove
+configure:3113: checking for shmat
+configure:3214: checking for IceConnectionNumber in -lICE
+configure:3270: checking for XF86DGAQueryExtension in -lXxf86dga
+configure:3314: checking for fl_initialize in -lforms
+configure:3397: checking for sdl-config
+configure:3432: checking for SDL - version >= 1.1.3
+configure:3517: gcc -o conftest -g -O2 -I/usr/local/include -I/usr/local/include/SDL -D_THREAD_SAFE -F/System/Library/Frameworks/Carbon.framework   conftest.c -lz -L/usr/local/lib -lSDLmain -lSDL -framework OpenGL -framework AGL -framework Carbon 1>&5
+configure:3605: checking for Intel Pentium architecture (IA32)
+configure:3716: checking for support of 3DNow in assembly code
+configure: failed program was:
+    .text
+
+    pfmul %mm3, %mm4
+configure:3842: checking what warning flags to pass to the C compiler
diff -Naur original/mjpegtools-1.4.1/config.status patched/mjpegtools-1.4.1/config.status
--- original/mjpegtools-1.4.1/config.status	Wed Dec 31 18:00:00 1969
+++ patched/mjpegtools-1.4.1/config.status	Mon Aug 27 15:56:20 2001
@@ -0,0 +1,335 @@
+#! /bin/sh
+# Generated automatically by configure.
+# Run this file to recreate the current configuration.
+# This directory was configured as follows,
+# on host Mima:
+#
+# ./configure 
+#
+# Compiler output produced by configure, useful for debugging
+# configure, is in ./config.log if it exists.
+
+ac_cs_usage="Usage: ./config.status [--recheck] [--version] [--help]"
+for ac_option
+do
+  case "$ac_option" in
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    echo "running ${CONFIG_SHELL-/bin/sh} ./configure  --no-create --no-recursion"
+    exec ${CONFIG_SHELL-/bin/sh} ./configure  --no-create --no-recursion ;;
+  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
+    echo "./config.status generated by autoconf version 2.13"
+    exit 0 ;;
+  -help | --help | --hel | --he | --h)
+    echo "$ac_cs_usage"; exit 0 ;;
+  *) echo "$ac_cs_usage"; exit 1 ;;
+  esac
+done
+
+ac_given_srcdir=.
+ac_given_INSTALL="/usr/bin/install -c"
+
+trap 'rm -fr 
+Makefile
+utils/Makefile
+docs/Makefile
+lavtools/Makefile
+mjpeg/Makefile
+mpeg2enc/Makefile
+aenc/Makefile
+mplex/Makefile
+scripts/Makefile
+ config.h conftest*; exit 1' 1 2 15
+
+# Protect against being on the right side of a sed subst in config.status.
+sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\&%]/\\&/g;
+ s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF
+/^[ 	]*VPATH[ 	]*=[^:]*$/d
+
+s%@SHELL@%/bin/sh%g
+s%@CFLAGS@% -g -O2 -Wall -Wunused%g
+s%@CPPFLAGS@%%g
+s%@CXXFLAGS@%%g
+s%@FFLAGS@%%g
+s%@DEFS@%-DHAVE_CONFIG_H%g
+s%@LDFLAGS@%%g
+s%@LIBS@%-lz%g
+s%@exec_prefix@%${prefix}%g
+s%@prefix@%/usr/local%g
+s%@program_transform_name@%s,x,x,%g
+s%@bindir@%${exec_prefix}/bin%g
+s%@sbindir@%${exec_prefix}/sbin%g
+s%@libexecdir@%${exec_prefix}/libexec%g
+s%@datadir@%${prefix}/share%g
+s%@sysconfdir@%${prefix}/etc%g
+s%@sharedstatedir@%${prefix}/com%g
+s%@localstatedir@%${prefix}/var%g
+s%@libdir@%${exec_prefix}/lib%g
+s%@includedir@%${prefix}/include%g
+s%@oldincludedir@%/usr/include%g
+s%@infodir@%${prefix}/info%g
+s%@mandir@%${prefix}/man%g
+s%@INSTALL_PROGRAM@%${INSTALL}%g
+s%@INSTALL_SCRIPT@%${INSTALL_PROGRAM}%g
+s%@INSTALL_DATA@%${INSTALL} -m 644%g
+s%@PACKAGE@%mjpegtools%g
+s%@VERSION@%1.4.1%g
+s%@ACLOCAL@%/Users/Shared/Projects/Unix/mjpegtools-1.4.1/missing aclocal%g
+s%@AUTOCONF@%autoconf%g
+s%@AUTOMAKE@%/Users/Shared/Projects/Unix/mjpegtools-1.4.1/missing automake%g
+s%@AUTOHEADER@%autoheader%g
+s%@MAKEINFO@%/Users/Shared/Projects/Unix/mjpegtools-1.4.1/missing makeinfo%g
+s%@SET_MAKE@%%g
+s%@MAINTAINER_MODE_TRUE@%#%g
+s%@MAINTAINER_MODE_FALSE@%%g
+s%@MAINT@%#%g
+s%@host@%powerpc-apple-darwin1.3.7%g
+s%@host_alias@%powerpc-apple-darwin1.3.7%g
+s%@host_cpu@%powerpc%g
+s%@host_vendor@%apple%g
+s%@host_os@%darwin1.3.7%g
+s%@AWK@%awk%g
+s%@CC@%gcc%g
+s%@LN_S@%ln -s%g
+s%@RANLIB@%ranlib%g
+s%@CPP@%gcc -E -traditional-cpp%g
+s%@GLIB_CONFIG@%/usr/local/bin/glib-config%g
+s%@GLIB_CFLAGS@%-I/usr/local/include/glib-1.2 -I/usr/local/lib/glib/include%g
+s%@GLIB_LIBS@%-L/usr/local/lib -lglib%g
+s%@PTHREAD_LIBS@%-lpthread%g
+s%@JPEG_LIBS@%-ljpeg%g
+s%@JPEG_CFLAGS@%%g
+s%@MOVTAR_CFLAGS@%-I/usr/include -I/usr/local/include -I/usr/local/include/glib-1.2 -I/usr/local/lib/glib/include%g
+s%@MOVTAR_LIBS@%-L/usr/local/lib -L/usr/local/lib -lglib -lmovtar%g
+s%@MOVTAR_CONFIG@%/usr/local/bin/movtar-config%g
+s%@MOVTAR_VERSION@%0.1.2%g
+s%@QUICKTIME_LIBS@%-L/usr/local/src/quicktime4linux-1.3 -lquicktime  -L/usr/local/lib -lglib  -lpthread  -lpng -ldl%g
+s%@QUICKTIME_CFLAGS@%-I /usr/local/src/quicktime4linux-1.3%g
+s%@X_CFLAGS@% -I/usr/X11R6/include%g
+s%@X_PRE_LIBS@% -lSM -lICE%g
+s%@X_LIBS@% -L/usr/X11R6/lib%g
+s%@X_EXTRA_LIBS@%%g
+s%@x_libraries@%/usr/X11R6/lib%g
+s%@V4LCONF_LIBS@%%g
+s%@FORMS_LIBS@%%g
+s%@SDL_CONFIG@%/usr/local/bin/sdl-config%g
+s%@SDL_CFLAGS@%-I/usr/local/include -I/usr/local/include/SDL -D_THREAD_SAFE -F/System/Library/Frameworks/Carbon.framework%g
+s%@SDL_LIBS@%-L/usr/local/lib -lSDLmain -lSDL -framework OpenGL -framework AGL -framework Carbon%g
+s%@NASM@%%g
+s%@NASMFLAGS@%%g
+s%@HAVE_ASM_MMX_TRUE@%#%g
+s%@HAVE_ASM_MMX_FALSE@%%g
+s%@HAVE_ASM_3DNOW_TRUE@%#%g
+s%@HAVE_ASM_3DNOW_FALSE@%%g
+s%@HAVE_ASM_NASM_TRUE@%#%g
+s%@HAVE_ASM_NASM_FALSE@%%g
+s%@HAVE_X86CPU_TRUE@%#%g
+s%@HAVE_X86CPU_FALSE@%%g
+s%@BUILD_MJPEG_TRUE@%%g
+s%@BUILD_MJPEG_FALSE@%#%g
+
+CEOF
+
+# Split the substitutions into bite-sized pieces for seds with
+# small command number limits, like on Digital OSF/1 and HP-UX.
+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_file=1 # Number of current file.
+ac_beg=1 # First line for current file.
+ac_end=$ac_max_sed_cmds # Line after last line for current file.
+ac_more_lines=:
+ac_sed_cmds=""
+while $ac_more_lines; do
+  if test $ac_beg -gt 1; then
+    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
+  else
+    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
+  fi
+  if test ! -s conftest.s$ac_file; then
+    ac_more_lines=false
+    rm -f conftest.s$ac_file
+  else
+    if test -z "$ac_sed_cmds"; then
+      ac_sed_cmds="sed -f conftest.s$ac_file"
+    else
+      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
+    fi
+    ac_file=`expr $ac_file + 1`
+    ac_beg=$ac_end
+    ac_end=`expr $ac_end + $ac_max_sed_cmds`
+  fi
+done
+if test -z "$ac_sed_cmds"; then
+  ac_sed_cmds=cat
+fi
+
+CONFIG_FILES=${CONFIG_FILES-"Makefile
+utils/Makefile
+docs/Makefile
+lavtools/Makefile
+mjpeg/Makefile
+mpeg2enc/Makefile
+aenc/Makefile
+mplex/Makefile
+scripts/Makefile
+"}
+for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case "$ac_file" in
+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+  *) ac_file_in="${ac_file}.in" ;;
+  esac
+
+  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
+
+  # Remove last slash and all that follows it.  Not all systems have dirname.
+  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+    # The file is in a subdirectory.
+    test ! -d "$ac_dir" && mkdir "$ac_dir"
+    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
+    # A "../" for each directory in $ac_dir_suffix.
+    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
+  else
+    ac_dir_suffix= ac_dots=
+  fi
+
+  case "$ac_given_srcdir" in
+  .)  srcdir=.
+      if test -z "$ac_dots"; then top_srcdir=.
+      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
+  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
+  *) # Relative path.
+    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
+    top_srcdir="$ac_dots$ac_given_srcdir" ;;
+  esac
+
+  case "$ac_given_INSTALL" in
+  [/$]*) INSTALL="$ac_given_INSTALL" ;;
+  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+  esac
+
+  echo creating "$ac_file"
+  rm -f "$ac_file"
+  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
+  case "$ac_file" in
+  *Makefile*) ac_comsub="1i\\
+# $configure_input" ;;
+  *) ac_comsub= ;;
+  esac
+
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  sed -e "$ac_comsub
+s%@configure_input@%$configure_input%g
+s%@srcdir@%$srcdir%g
+s%@top_srcdir@%$top_srcdir%g
+s%@INSTALL@%$INSTALL%g
+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
+fi; done
+rm -f conftest.s*
+
+# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
+# NAME is the cpp macro being defined and VALUE is the value it is being given.
+#
+# ac_d sets the value in "#define NAME VALUE" lines.
+ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
+ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
+ac_dC='\3'
+ac_dD='%g'
+# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
+ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
+ac_uB='\([ 	]\)%\1#\2define\3'
+ac_uC=' '
+ac_uD='\4%g'
+# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
+ac_eB='$%\1#\2define\3'
+ac_eC=' '
+ac_eD='%g'
+
+if test "${CONFIG_HEADERS+set}" != set; then
+  CONFIG_HEADERS="config.h"
+fi
+for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case "$ac_file" in
+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+  *) ac_file_in="${ac_file}.in" ;;
+  esac
+
+  echo creating $ac_file
+
+  rm -f conftest.frag conftest.in conftest.out
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  cat $ac_file_inputs > conftest.in
+
+  cat > conftest.frag <<CEOF
+${ac_dA}PACKAGE${ac_dB}PACKAGE${ac_dC}"mjpegtools"${ac_dD}
+${ac_uA}PACKAGE${ac_uB}PACKAGE${ac_uC}"mjpegtools"${ac_uD}
+${ac_eA}PACKAGE${ac_eB}PACKAGE${ac_eC}"mjpegtools"${ac_eD}
+${ac_dA}VERSION${ac_dB}VERSION${ac_dC}"1.4.1"${ac_dD}
+${ac_uA}VERSION${ac_uB}VERSION${ac_uC}"1.4.1"${ac_uD}
+${ac_eA}VERSION${ac_eB}VERSION${ac_eC}"1.4.1"${ac_eD}
+${ac_dA}WORDS_BIGENDIAN${ac_dB}WORDS_BIGENDIAN${ac_dC}1${ac_dD}
+${ac_uA}WORDS_BIGENDIAN${ac_uB}WORDS_BIGENDIAN${ac_uC}1${ac_uD}
+${ac_eA}WORDS_BIGENDIAN${ac_eB}WORDS_BIGENDIAN${ac_eC}1${ac_eD}
+${ac_dA}HAVE_LIBPTHREAD${ac_dB}HAVE_LIBPTHREAD${ac_dC}1${ac_dD}
+${ac_uA}HAVE_LIBPTHREAD${ac_uB}HAVE_LIBPTHREAD${ac_uC}1${ac_uD}
+${ac_eA}HAVE_LIBPTHREAD${ac_eB}HAVE_LIBPTHREAD${ac_eC}1${ac_eD}
+CEOF
+  sed -f conftest.frag conftest.in > conftest.out
+  rm -f conftest.in
+  mv conftest.out conftest.in
+
+  cat > conftest.frag <<CEOF
+${ac_dA}HAVE_PTHREADSTACKSIZE${ac_dB}HAVE_PTHREADSTACKSIZE${ac_dC}1${ac_dD}
+${ac_uA}HAVE_PTHREADSTACKSIZE${ac_uB}HAVE_PTHREADSTACKSIZE${ac_uC}1${ac_uD}
+${ac_eA}HAVE_PTHREADSTACKSIZE${ac_eB}HAVE_PTHREADSTACKSIZE${ac_eC}1${ac_eD}
+${ac_dA}HAVE_LIBMOVTAR${ac_dB}HAVE_LIBMOVTAR${ac_dC}1${ac_dD}
+${ac_uA}HAVE_LIBMOVTAR${ac_uB}HAVE_LIBMOVTAR${ac_uC}1${ac_uD}
+${ac_eA}HAVE_LIBMOVTAR${ac_eB}HAVE_LIBMOVTAR${ac_eC}1${ac_eD}
+${ac_dA}HAVE_LIBQUICKTIME${ac_dB}HAVE_LIBQUICKTIME${ac_dC}1${ac_dD}
+${ac_uA}HAVE_LIBQUICKTIME${ac_uB}HAVE_LIBQUICKTIME${ac_uC}1${ac_uD}
+${ac_eA}HAVE_LIBQUICKTIME${ac_eB}HAVE_LIBQUICKTIME${ac_eC}1${ac_eD}
+${ac_dA}HAVE_LIBXXF86DGA${ac_dB}HAVE_LIBXXF86DGA${ac_dC}1${ac_dD}
+${ac_uA}HAVE_LIBXXF86DGA${ac_uB}HAVE_LIBXXF86DGA${ac_uC}1${ac_uD}
+${ac_eA}HAVE_LIBXXF86DGA${ac_eB}HAVE_LIBXXF86DGA${ac_eC}1${ac_eD}
+CEOF
+  sed -f conftest.frag conftest.in > conftest.out
+  rm -f conftest.in
+  mv conftest.out conftest.in
+
+  cat > conftest.frag <<CEOF
+${ac_dA}BUILD_MJPEG${ac_dB}BUILD_MJPEG${ac_dC}1${ac_dD}
+${ac_uA}BUILD_MJPEG${ac_uB}BUILD_MJPEG${ac_uC}1${ac_uD}
+${ac_eA}BUILD_MJPEG${ac_eB}BUILD_MJPEG${ac_eC}1${ac_eD}
+s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
+CEOF
+  sed -f conftest.frag conftest.in > conftest.out
+  rm -f conftest.in
+  mv conftest.out conftest.in
+
+  rm -f conftest.frag conftest.h
+  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
+  cat conftest.in >> conftest.h
+  rm -f conftest.in
+  if cmp -s $ac_file conftest.h 2>/dev/null; then
+    echo "$ac_file is unchanged"
+    rm -f conftest.h
+  else
+    # Remove last slash and all that follows it.  Not all systems have dirname.
+      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+      # The file is in a subdirectory.
+      test ! -d "$ac_dir" && mkdir "$ac_dir"
+    fi
+    rm -f $ac_file
+    mv conftest.h $ac_file
+  fi
+fi; done
+
+
+
+test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
+
+exit 0
diff -Naur original/mjpegtools-1.4.1/config.sub patched/mjpegtools-1.4.1/config.sub
--- original/mjpegtools-1.4.1/config.sub	Sat Mar 11 03:25:38 2000
+++ patched/mjpegtools-1.4.1/config.sub	Mon Aug 27 15:56:20 2001
@@ -1,6 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+#   Free Software Foundation, Inc.
+#
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can.
@@ -25,6 +27,9 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+# Written by Per Bothner <bothner@cygnus.com>.
+# Please send patches to <config-patches@gnu.org>.
+#
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
@@ -68,7 +73,7 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  linux-gnu*)
+  nto-qnx* | linux-gnu*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -105,7 +110,7 @@
 	-scout)
 		;;
 	-wrs)
-		os=vxworks
+		os=-vxworks
 		basic_machine=$1
 		;;
 	-hiux*)
@@ -156,6 +161,10 @@
 	-psos*)
 		os=-psos
 		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
 esac
 
 # Decode aliases for certain CPU-COMPANY combinations.
@@ -165,18 +174,21 @@
 	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
 		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
 		| 580 | i960 | h8300 \
+		| x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
 		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
-		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
+		| hppa64 \
+		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
+		| alphaev6[78] \
 		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
 		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
 		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
 		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
 		| mips64vr5000 | miprs64vr5000el | mcore \
 		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
-		| thumb | d10v)
+		| thumb | d10v | fr30 | avr)
 		basic_machine=$basic_machine-unknown
 		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
 		;;
 
 	# We use `pc' rather than `unknown'
@@ -197,8 +209,11 @@
 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
 	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
 	      | xmp-* | ymp-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
-	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
+	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
+	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
+	      | hppa2.0n-* | hppa64-* \
+	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
+	      | alphaev6[78]-* \
 	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
 	      | clipper-* | orion-* \
 	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
@@ -206,9 +221,10 @@
 	      | mips64el-* | mips64orion-* | mips64orionel-* \
 	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
 	      | mipstx39-* | mipstx39el-* | mcore-* \
-	      | f301-* | armv*-* | t3e-* \
+	      | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
 	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
+	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
+	      | bs2000-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -426,7 +442,6 @@
 		;;
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
-		os=-mvs
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i[34567]86v32)
@@ -489,7 +504,7 @@
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
-	*mint | *MiNT)
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
 		basic_machine=m68k-atari
 		os=-mint
 		;;
@@ -507,6 +522,10 @@
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
+	mmix*)
+		basic_machine=mmix-knuth
+		os=-mmixware
+		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -515,6 +534,10 @@
 		basic_machine=i386-unknown
 		os=-msdos
 		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -524,7 +547,7 @@
 		os=-netbsd
 		;;
 	netwinder)
-		basic_machine=armv4l-corel
+		basic_machine=armv4l-rebel
 		os=-linux
 		;;
 	news | news700 | news800 | news900)
@@ -575,6 +598,9 @@
 	np1)
 		basic_machine=np1-gould
 		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
 	op50n-* | op60c-*)
 		basic_machine=hppa1.1-oki
 		os=-proelf
@@ -719,6 +745,10 @@
 	sun386 | sun386i | roadrunner)
 		basic_machine=i386-sun
 		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
 	symmetry)
 		basic_machine=i386-sequent
 		os=-dynix
@@ -908,12 +938,25 @@
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
+	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i[34567]86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto*)
+		os=-nto-qnx
+		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
@@ -927,6 +970,12 @@
 	-sunos6*)
 		os=`echo $os | sed -e 's|sunos6|solaris3|'`
 		;;
+	-opened*)
+		os=-openedition
+		;;
+	-wince*)
+		os=-wince
+		;;
 	-osfrose*)
 		os=-osfrose
 		;;
@@ -951,6 +1000,9 @@
 	-ns2 )
 	        os=-nextstep2
 		;;
+	-nsk)
+		os=-nsk
+		;;
 	# Preserve the version number of sinix5.
 	-sinix5.*)
 		os=`echo $os | sed -e 's|sinix|sysv|'`
@@ -1013,7 +1065,7 @@
 	*-acorn)
 		os=-riscix1.2
 		;;
-	arm*-corel)
+	arm*-rebel)
 		os=-linux
 		;;
 	arm*-semi)
@@ -1187,7 +1239,7 @@
 			-genix*)
 				vendor=ns
 				;;
-			-mvs*)
+			-mvs* | -opened*)
 				vendor=ibm
 				;;
 			-ptx*)
diff -Naur original/mjpegtools-1.4.1/docs/Makefile patched/mjpegtools-1.4.1/docs/Makefile
--- original/mjpegtools-1.4.1/docs/Makefile	Wed Dec 31 18:00:00 1969
+++ patched/mjpegtools-1.4.1/docs/Makefile	Mon Aug 27 15:56:20 2001
@@ -0,0 +1,247 @@
+# Generated automatically from Makefile.in by configure.
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# If the installation of man pages by you (e.g. you're a package builder)
+# You may want to disable it
+
+
+SHELL = /bin/sh
+
+srcdir = .
+top_srcdir = ..
+prefix = /usr/local
+exec_prefix = ${prefix}
+
+bindir = ${exec_prefix}/bin
+sbindir = ${exec_prefix}/sbin
+libexecdir = ${exec_prefix}/libexec
+datadir = ${prefix}/share
+sysconfdir = ${prefix}/etc
+sharedstatedir = ${prefix}/com
+localstatedir = ${prefix}/var
+libdir = ${exec_prefix}/lib
+infodir = ${prefix}/info
+mandir = ${prefix}/man
+includedir = ${prefix}/include
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/mjpegtools
+pkglibdir = $(libdir)/mjpegtools
+pkgincludedir = $(includedir)/mjpegtools
+
+top_builddir = ..
+
+ACLOCAL = /Users/Shared/Projects/Unix/mjpegtools-1.4.1/missing aclocal
+AUTOCONF = autoconf
+AUTOMAKE = /Users/Shared/Projects/Unix/mjpegtools-1.4.1/missing automake
+AUTOHEADER = autoheader
+
+INSTALL = /usr/bin/install -c
+INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_SCRIPT = ${INSTALL_PROGRAM}
+transform = s,x,x,
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = powerpc-apple-darwin1.3.7
+host_triplet = powerpc-apple-darwin1.3.7
+AWK = awk
+CC = gcc
+FORMS_LIBS = 
+GLIB_CFLAGS = -I/usr/local/include/glib-1.2 -I/usr/local/lib/glib/include
+GLIB_CONFIG = /usr/local/bin/glib-config
+GLIB_LIBS = -L/usr/local/lib -lglib
+JPEG_CFLAGS = 
+JPEG_LIBS = -ljpeg
+LN_S = ln -s
+MAINT = #
+MAKEINFO = /Users/Shared/Projects/Unix/mjpegtools-1.4.1/missing makeinfo
+MOVTAR_CFLAGS = -I/usr/include -I/usr/local/include -I/usr/local/include/glib-1.2 -I/usr/local/lib/glib/include
+MOVTAR_CONFIG = /usr/local/bin/movtar-config
+MOVTAR_LIBS = -L/usr/local/lib -L/usr/local/lib -lglib -lmovtar
+MOVTAR_VERSION = 0.1.2
+NASM = 
+NASMFLAGS = 
+PACKAGE = mjpegtools
+PTHREAD_LIBS = -lpthread
+QUICKTIME_CFLAGS = -I /usr/local/src/quicktime4linux-1.3
+QUICKTIME_LIBS = -L/usr/local/src/quicktime4linux-1.3 -lquicktime  -L/usr/local/lib -lglib  -lpthread  -lpng -ldl
+RANLIB = ranlib
+SDL_CFLAGS = -I/usr/local/include -I/usr/local/include/SDL -D_THREAD_SAFE -F/System/Library/Frameworks/Carbon.framework
+SDL_CONFIG = /usr/local/bin/sdl-config
+SDL_LIBS = -L/usr/local/lib -lSDLmain -lSDL -framework OpenGL -framework AGL -framework Carbon
+V4LCONF_LIBS = 
+VERSION = 1.4.1
+X_CFLAGS =  -I/usr/X11R6/include
+X_EXTRA_LIBS = 
+X_LIBS =  -L/usr/X11R6/lib
+X_PRE_LIBS =  -lSM -lICE
+x_libraries = /usr/X11R6/lib
+
+man_MANS = lavplay.1  lavrec.1  mjpegtools.1  mpeg2enc.1  mplex.1 	yuvplay.1 lav2wav.1 lav2yuv.1 lavtrans.1 mp2enc.1 xlav.1 	yuvscaler.1 lavpipe.1 yuv2lav.1
+
+
+EXTRA_DIST = $(man_MANS)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = ../config.h
+CONFIG_CLEAN_FILES = 
+man1dir = $(mandir)/man1
+MANS = $(man_MANS)
+
+NROFF = nroff
+DIST_COMMON =  Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: # Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps docs/Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+install-man1:
+	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+	@list='$(man1_MANS)'; \
+	l2='$(man_MANS)'; for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+	  else file=$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+	done
+
+uninstall-man1:
+	@list='$(man1_MANS)'; \
+	l2='$(man_MANS)'; for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
+	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
+	done
+install-man: $(MANS)
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-man1
+uninstall-man:
+	@$(NORMAL_UNINSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = docs
+
+distdir: $(DISTFILES)
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am: install-man
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am: uninstall-man
+uninstall: uninstall-am
+all-am: Makefile $(MANS)
+all-redirect: all-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-generic clean-am
+
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-generic distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: install-man1 uninstall-man1 install-man uninstall-man tags \
+distdir info-am info dvi-am dvi check check-am installcheck-am \
+installcheck install-exec-am install-exec install-data-am install-data \
+install-am install uninstall-am uninstall all-redirect all-am all \
+installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Naur original/mjpegtools-1.4.1/lavtools/Makefile patched/mjpegtools-1.4.1/lavtools/Makefile
--- original/mjpegtools-1.4.1/lavtools/Makefile	Wed Dec 31 18:00:00 1969
+++ patched/mjpegtools-1.4.1/lavtools/Makefile	Mon Aug 27 15:56:19 2001
@@ -0,0 +1,585 @@
+# Generated automatically from Makefile.in by configure.
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Makefile for lavtools
+
+
+SHELL = /bin/sh
+
+srcdir = .
+top_srcdir = ..
+prefix = /usr/local
+exec_prefix = ${prefix}
+
+bindir = ${exec_prefix}/bin
+sbindir = ${exec_prefix}/sbin
+libexecdir = ${exec_prefix}/libexec
+datadir = ${prefix}/share
+sysconfdir = ${prefix}/etc
+sharedstatedir = ${prefix}/com
+localstatedir = ${prefix}/var
+libdir = ${exec_prefix}/lib
+infodir = ${prefix}/info
+mandir = ${prefix}/man
+includedir = ${prefix}/include
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/mjpegtools
+pkglibdir = $(libdir)/mjpegtools
+pkgincludedir = $(includedir)/mjpegtools
+
+top_builddir = ..
+
+ACLOCAL = /Users/Shared/Projects/Unix/mjpegtools-1.4.1/missing aclocal
+AUTOCONF = autoconf
+AUTOMAKE = /Users/Shared/Projects/Unix/mjpegtools-1.4.1/missing automake
+AUTOHEADER = autoheader
+
+INSTALL = /usr/bin/install -c
+INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_SCRIPT = ${INSTALL_PROGRAM}
+transform = s,x,x,
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = powerpc-apple-darwin1.3.7
+host_triplet = powerpc-apple-darwin1.3.7
+AWK = awk
+CC = gcc
+FORMS_LIBS = 
+GLIB_CFLAGS = -I/usr/local/include/glib-1.2 -I/usr/local/lib/glib/include
+GLIB_CONFIG = /usr/local/bin/glib-config
+GLIB_LIBS = -L/usr/local/lib -lglib
+JPEG_CFLAGS = 
+JPEG_LIBS = -ljpeg
+LN_S = ln -s
+MAINT = #
+MAKEINFO = /Users/Shared/Projects/Unix/mjpegtools-1.4.1/missing makeinfo
+MOVTAR_CFLAGS = -I/usr/include -I/usr/local/include -I/usr/local/include/glib-1.2 -I/usr/local/lib/glib/include
+MOVTAR_CONFIG = /usr/local/bin/movtar-config
+MOVTAR_LIBS = -L/usr/local/lib -L/usr/local/lib -lglib -lmovtar
+MOVTAR_VERSION = 0.1.2
+NASM = 
+NASMFLAGS = 
+PACKAGE = mjpegtools
+PTHREAD_LIBS = -lpthread
+QUICKTIME_CFLAGS = -I /usr/local/src/quicktime4linux-1.3
+QUICKTIME_LIBS = -L/usr/local/src/quicktime4linux-1.3 -lquicktime  -L/usr/local/lib -lglib  -lpthread  -lpng -ldl
+RANLIB = ranlib
+SDL_CFLAGS = -I/usr/local/include -I/usr/local/include/SDL -D_THREAD_SAFE -F/System/Library/Frameworks/Carbon.framework
+SDL_CONFIG = /usr/local/bin/sdl-config
+SDL_LIBS = -L/usr/local/lib -lSDLmain -lSDL -framework OpenGL -framework AGL -framework Carbon
+V4LCONF_LIBS = 
+VERSION = 1.4.1
+X_CFLAGS =  -I/usr/X11R6/include
+X_EXTRA_LIBS = 
+X_LIBS =  -L/usr/X11R6/lib
+X_PRE_LIBS =  -lSM -lICE
+x_libraries = /usr/X11R6/lib
+
+INCLUDES = -I$(top_srcdir)/utils 	-I$(top_srcdir)/mjpeg -I$(includedir) 	-DG_LOG_DOMAIN=\"lavtools\" -DLAVPLAY_VERSION=\"$(VERSION)\" 	$(MOVTAR_CFLAGS) $(QUICKTIME_CFLAGS)  -I /usr/X11R6/include/X11 -I /usr/X11R6/include
+
+
+# *********************************************************************
+# Support lib
+
+lib_LIBRARIES = libavio.a
+libavio_a_SOURCES = editlist.c lav_io.c avilib.c
+
+# *********************************************************************
+# The tools themselves
+
+bin_PROGRAMS =  	lav2wav  lav2yuv yuvmedianfilter lavaddwav 	lavtrans ypipe yuv2lav  	transist.flt matteblend.flt lavpipe yuvscaler yuvplay
+
+
+lav_headers = lav_io.h editlist.h xlav.h avilib.h yuv4mpeg.h jpegutils.h yuvscaler.h
+
+ypipe_SOURCES = ypipe.c yuv4mpeg.c $(lav_headers)
+ypipe_LDADD = $(top_srcdir)/utils/libutils.a
+
+yuv2lav_SOURCES = yuv2lav.c jpegutils.c yuv4mpeg.c $(lav_headers)
+yuv2lav_LDADD = $(top_builddir)/lavtools/libavio.a $(MOVTAR_LIBS)        $(QUICKTIME_LIBS) $(JPEG_LIBS)  $(top_srcdir)/utils/libutils.a
+
+
+transist_flt_SOURCES = transist.flt.c yuv4mpeg.c ${lav_headers}
+transist_flt_LDADD = $(top_srcdir)/utils/libutils.a
+
+matteblend_flt_SOURCES = matteblend.flt.c yuv4mpeg.c ${lav_headers}
+matteblend_flt_LDADD = $(top_srcdir)/utils/libutils.a
+
+lavplay_SOURCES = lavplay.c avilib.c audiolib.c lav_io.c editlist.c  $(lav_headers)
+lavplay_LDADD = $(top_builddir)/mjpeg/libmjpeg.a $(PTHREAD_LIBS) 	$(QUICKTIME_LIBS) $(MOVTAR_LIBS) $(SDL_LIBS) $(JPEG_LIBS) 	$(top_srcdir)/utils/libutils.a
+
+
+lavrec_SOURCES = lavrec.c avilib.c audiolib.c lav_io.c frequencies.c         frequencies.h $(lav_headers)
+
+lavrec_LDADD = $(top_builddir)/mjpeg/libmjpeg.a $(PTHREAD_LIBS) 	$(QUICKTIME_LIBS) $(MOVTAR_LIBS) $(JPEG_LIBS) 	$(top_srcdir)/utils/libutils.a
+
+
+testrec_SOURCES = testrec.c  audiolib.c  $(lav_headers)
+testrec_LDADD = $(PTHREAD_LIBS) $(top_srcdir)/utils/libutils.a
+
+lav2yuv_SOURCES = lav2yuv.c  jpegutils.c yuv4mpeg.c $(lav_headers)
+lav2yuv_LDADD = $(top_builddir)/lavtools/libavio.a $(QUICKTIME_LIBS) 	$(MOVTAR_LIBS) 	$(JPEG_LIBS) $(top_srcdir)/utils/libutils.a
+
+
+lavpipe_SOURCES = lavpipe.c yuv4mpeg.c pipelist.c pipelist.h $(lav_headers)
+lavpipe_LDADD = $(top_srcdir)/utils/libutils.a
+
+yuvmedianfilter_SOURCES = yuvmedianfilter.c $(lav_headers)
+yuvmedianfilter_LDFLAGS = -L$(top_builddir)/lavtools 
+yuvmedianfilter_LDADD = $(top_srcdir)/utils/libutils.a
+
+lav2wav_SOURCES = lav2wav.c  $(lav_headers)
+lav2wav_LDADD = $(top_builddir)/lavtools/libavio.a $(MOVTAR_LIBS) 	$(QUICKTIME_LIBS) $(JPEG_LIBS) $(top_srcdir)/utils/libutils.a
+
+
+lavtrans_SOURCES = lavtrans.c $(lav_headers)
+lavtrans_LDADD = $(top_builddir)/lavtools/libavio.a $(MOVTAR_LIBS) 	$(QUICKTIME_LIBS) $(JPEG_LIBS) $(top_srcdir)/utils/libutils.a
+
+
+lavaddwav_SOURCES = lavaddwav.c $(lav_headers)
+lavaddwav_LDADD = $(top_builddir)/lavtools/libavio.a $(MOVTAR_LIBS) 		$(QUICKTIME_LIBS) $(JPEG_LIBS) $(top_srcdir)/utils/libutils.a
+
+
+xlav_SOURCES = xlav.c xlav_main.c  $(lav_headers)
+xlav_LDADD = $(X_LIBS) -lX11 $(FORMS_LIBS) $(X_EXTRA_LIBS) $(top_srcdir)/utils/libutils.a
+
+lavvideo_SOURCES = lavvideo.c
+
+yuvscaler_SOURCES = yuvscaler.c editlist.c lav_io.c $(lav_headers)
+yuvscaler_LDADD = $(top_builddir)/lavtools/libavio.a $(MOVTAR_LIBS) 	$(QUICKTIME_LIBS) $(JPEG_LIBS) $(top_srcdir)/utils/libutils.a
+
+
+yuvplay_SOURCES = yuvplay.c yuv4mpeg.h yuv4mpeg.c
+yuvplay_LDADD = $(SDL_LIBS) $(top_srcdir)/utils/libutils.a
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = ../config.h
+CONFIG_CLEAN_FILES = 
+LIBRARIES =  $(lib_LIBRARIES)
+
+
+DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
+CPPFLAGS = 
+LDFLAGS = 
+LIBS = -lz
+libavio_a_LIBADD = 
+libavio_a_OBJECTS =  editlist.o lav_io.o avilib.o
+AR = ar
+PROGRAMS =  $(bin_PROGRAMS)
+
+lavplay_OBJECTS =  lavplay.o avilib.o audiolib.o lav_io.o editlist.o
+lavplay_DEPENDENCIES = 
+lavplay_LDFLAGS = 
+lavrec_OBJECTS =  lavrec.o avilib.o audiolib.o lav_io.o frequencies.o
+lavrec_DEPENDENCIES = 
+lavrec_LDFLAGS = 
+lav2wav_OBJECTS =  lav2wav.o
+lav2wav_DEPENDENCIES = 
+lav2wav_LDFLAGS = 
+lav2yuv_OBJECTS =  lav2yuv.o jpegutils.o yuv4mpeg.o
+lav2yuv_DEPENDENCIES = 
+lav2yuv_LDFLAGS = 
+yuvmedianfilter_OBJECTS =  yuvmedianfilter.o
+yuvmedianfilter_DEPENDENCIES = 
+lavaddwav_OBJECTS =  lavaddwav.o
+lavaddwav_DEPENDENCIES = 
+lavaddwav_LDFLAGS = 
+lavvideo_OBJECTS =  lavvideo.o
+lavvideo_LDADD = $(LDADD)
+lavvideo_DEPENDENCIES = 
+lavvideo_LDFLAGS = 
+lavtrans_OBJECTS =  lavtrans.o
+lavtrans_DEPENDENCIES = 
+lavtrans_LDFLAGS = 
+xlav_OBJECTS =  xlav.o xlav_main.o
+xlav_DEPENDENCIES = 
+xlav_LDFLAGS = 
+ypipe_OBJECTS =  ypipe.o yuv4mpeg.o
+ypipe_DEPENDENCIES = 
+ypipe_LDFLAGS = 
+yuv2lav_OBJECTS =  yuv2lav.o jpegutils.o yuv4mpeg.o
+yuv2lav_DEPENDENCIES = 
+yuv2lav_LDFLAGS = 
+testrec_OBJECTS =  testrec.o audiolib.o
+testrec_DEPENDENCIES = 
+testrec_LDFLAGS = 
+transist_flt_OBJECTS =  transist.flt.o yuv4mpeg.o
+transist_flt_DEPENDENCIES = 
+transist_flt_LDFLAGS = 
+matteblend_flt_OBJECTS =  matteblend.flt.o yuv4mpeg.o
+matteblend_flt_DEPENDENCIES = 
+matteblend_flt_LDFLAGS = 
+lavpipe_OBJECTS =  lavpipe.o yuv4mpeg.o pipelist.o
+lavpipe_DEPENDENCIES = 
+lavpipe_LDFLAGS = 
+yuvscaler_OBJECTS =  yuvscaler.o editlist.o lav_io.o
+yuvscaler_DEPENDENCIES = 
+yuvscaler_LDFLAGS = 
+yuvplay_OBJECTS =  yuvplay.o yuv4mpeg.o
+yuvplay_DEPENDENCIES = 
+yuvplay_LDFLAGS = 
+CFLAGS =  -g -O2 -Wall -Wunused
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+DIST_COMMON =  Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+SOURCES = $(libavio_a_SOURCES) $(lavplay_SOURCES) $(lavrec_SOURCES) $(lav2wav_SOURCES) $(lav2yuv_SOURCES) $(yuvmedianfilter_SOURCES) $(lavaddwav_SOURCES) $(lavvideo_SOURCES) $(lavtrans_SOURCES) $(xlav_SOURCES) $(ypipe_SOURCES) $(yuv2lav_SOURCES) $(testrec_SOURCES) $(transist_flt_SOURCES) $(matteblend_flt_SOURCES) $(lavpipe_SOURCES) $(yuvscaler_SOURCES) $(yuvplay_SOURCES)
+OBJECTS = $(libavio_a_OBJECTS) $(lavplay_OBJECTS) $(lavrec_OBJECTS) $(lav2wav_OBJECTS) $(lav2yuv_OBJECTS) $(yuvmedianfilter_OBJECTS) $(lavaddwav_OBJECTS) $(lavvideo_OBJECTS) $(lavtrans_OBJECTS) $(xlav_OBJECTS) $(ypipe_OBJECTS) $(yuv2lav_OBJECTS) $(testrec_OBJECTS) $(transist_flt_OBJECTS) $(matteblend_flt_OBJECTS) $(lavpipe_OBJECTS) $(yuvscaler_OBJECTS) $(yuvplay_OBJECTS)
+
+all: all-redirect
+.SUFFIXES:
+.SUFFIXES: .S .c .o .s
+$(srcdir)/Makefile.in: # Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lavtools/Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+mostlyclean-libLIBRARIES:
+
+clean-libLIBRARIES:
+	-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
+
+distclean-libLIBRARIES:
+
+maintainer-clean-libLIBRARIES:
+
+install-libLIBRARIES: $(lib_LIBRARIES)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	@list='$(lib_LIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
+	    $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
+	  else :; fi; \
+	done
+	@$(POST_INSTALL)
+	@list='$(lib_LIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
+	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
+	  else :; fi; \
+	done
+
+uninstall-libLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	list='$(lib_LIBRARIES)'; for p in $$list; do \
+	  rm -f $(DESTDIR)$(libdir)/$$p; \
+	done
+
+.c.o:
+	$(COMPILE) -c $<
+
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
+	$(COMPILE) -c $<
+
+mostlyclean-compile:
+	-rm -f *.o core *.core
+
+clean-compile:
+
+distclean-compile:
+	-rm -f *.tab.c
+
+maintainer-clean-compile:
+
+libavio.a: $(libavio_a_OBJECTS) $(libavio_a_DEPENDENCIES)
+	-rm -f libavio.a
+	$(AR) cru libavio.a $(libavio_a_OBJECTS) $(libavio_a_LIBADD)
+	$(RANLIB) libavio.a
+
+mostlyclean-binPROGRAMS:
+
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
+distclean-binPROGRAMS:
+
+maintainer-clean-binPROGRAMS:
+
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  else :; fi; \
+	done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	done
+
+lavplay: $(lavplay_OBJECTS) $(lavplay_DEPENDENCIES)
+	@rm -f lavplay
+	$(LINK) $(lavplay_LDFLAGS) $(lavplay_OBJECTS) $(lavplay_LDADD) $(LIBS)
+
+lavrec: $(lavrec_OBJECTS) $(lavrec_DEPENDENCIES)
+	@rm -f lavrec
+	$(LINK) $(lavrec_LDFLAGS) $(lavrec_OBJECTS) $(lavrec_LDADD) $(LIBS)
+
+lav2wav: $(lav2wav_OBJECTS) $(lav2wav_DEPENDENCIES)
+	@rm -f lav2wav
+	$(LINK) $(lav2wav_LDFLAGS) $(lav2wav_OBJECTS) $(lav2wav_LDADD) $(LIBS)
+
+lav2yuv: $(lav2yuv_OBJECTS) $(lav2yuv_DEPENDENCIES)
+	@rm -f lav2yuv
+	$(LINK) $(lav2yuv_LDFLAGS) $(lav2yuv_OBJECTS) $(lav2yuv_LDADD) $(LIBS)
+
+yuvmedianfilter: $(yuvmedianfilter_OBJECTS) $(yuvmedianfilter_DEPENDENCIES)
+	@rm -f yuvmedianfilter
+	$(LINK) $(yuvmedianfilter_LDFLAGS) $(yuvmedianfilter_OBJECTS) $(yuvmedianfilter_LDADD) $(LIBS)
+
+lavaddwav: $(lavaddwav_OBJECTS) $(lavaddwav_DEPENDENCIES)
+	@rm -f lavaddwav
+	$(LINK) $(lavaddwav_LDFLAGS) $(lavaddwav_OBJECTS) $(lavaddwav_LDADD) $(LIBS)
+
+lavvideo: $(lavvideo_OBJECTS) $(lavvideo_DEPENDENCIES)
+	@rm -f lavvideo
+	$(LINK) $(lavvideo_LDFLAGS) $(lavvideo_OBJECTS) $(lavvideo_LDADD) $(LIBS)
+
+lavtrans: $(lavtrans_OBJECTS) $(lavtrans_DEPENDENCIES)
+	@rm -f lavtrans
+	$(LINK) $(lavtrans_LDFLAGS) $(lavtrans_OBJECTS) $(lavtrans_LDADD) $(LIBS)
+
+xlav: $(xlav_OBJECTS) $(xlav_DEPENDENCIES)
+	@rm -f xlav
+	$(LINK) $(xlav_LDFLAGS) $(xlav_OBJECTS) $(xlav_LDADD) $(LIBS)
+
+ypipe: $(ypipe_OBJECTS) $(ypipe_DEPENDENCIES)
+	@rm -f ypipe
+	$(LINK) $(ypipe_LDFLAGS) $(ypipe_OBJECTS) $(ypipe_LDADD) $(LIBS)
+
+yuv2lav: $(yuv2lav_OBJECTS) $(yuv2lav_DEPENDENCIES)
+	@rm -f yuv2lav
+	$(LINK) $(yuv2lav_LDFLAGS) $(yuv2lav_OBJECTS) $(yuv2lav_LDADD) $(LIBS)
+
+testrec: $(testrec_OBJECTS) $(testrec_DEPENDENCIES)
+	@rm -f testrec
+	$(LINK) $(testrec_LDFLAGS) $(testrec_OBJECTS) $(testrec_LDADD) $(LIBS)
+
+transist.flt: $(transist_flt_OBJECTS) $(transist_flt_DEPENDENCIES)
+	@rm -f transist.flt
+	$(LINK) $(transist_flt_LDFLAGS) $(transist_flt_OBJECTS) $(transist_flt_LDADD) $(LIBS)
+
+matteblend.flt: $(matteblend_flt_OBJECTS) $(matteblend_flt_DEPENDENCIES)
+	@rm -f matteblend.flt
+	$(LINK) $(matteblend_flt_LDFLAGS) $(matteblend_flt_OBJECTS) $(matteblend_flt_LDADD) $(LIBS)
+
+lavpipe: $(lavpipe_OBJECTS) $(lavpipe_DEPENDENCIES)
+	@rm -f lavpipe
+	$(LINK) $(lavpipe_LDFLAGS) $(lavpipe_OBJECTS) $(lavpipe_LDADD) $(LIBS)
+
+yuvscaler: $(yuvscaler_OBJECTS) $(yuvscaler_DEPENDENCIES)
+	@rm -f yuvscaler
+	$(LINK) $(yuvscaler_LDFLAGS) $(yuvscaler_OBJECTS) $(yuvscaler_LDADD) $(LIBS)
+
+yuvplay: $(yuvplay_OBJECTS) $(yuvplay_DEPENDENCIES)
+	@rm -f yuvplay
+	$(LINK) $(yuvplay_LDFLAGS) $(yuvplay_OBJECTS) $(yuvplay_LDADD)
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $$unique $(LISP)
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+	-rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = lavtools
+
+distdir: $(DISTFILES)
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+audiolib.o: audiolib.c ../utils/mjpeg_logging.h ../utils/mjpeg_types.h
+avilib.o: avilib.c ../config.h avilib.h ../utils/mjpeg_logging.h \
+	../utils/mjpeg_types.h
+editlist.o: editlist.c ../utils/mjpeg_logging.h ../utils/mjpeg_types.h \
+	lav_io.h editlist.h
+frequencies.o: frequencies.c frequencies.h
+jpegutils.o: jpegutils.c ../utils/mjpeg_logging.h ../utils/mjpeg_types.h \
+	lav_io.h
+lav2dfilter.o: lav2dfilter.c ../utils/mjpeg_logging.h \
+	../utils/mjpeg_types.h
+lav2wav.o: lav2wav.c ../config.h lav_io.h editlist.h \
+	../utils/mjpeg_logging.h ../utils/mjpeg_types.h
+lav2yuv.o: lav2yuv.c ../config.h lav_io.h editlist.h yuv4mpeg.h \
+	../utils/mjpeg_logging.h ../utils/mjpeg_types.h
+lav_io.o: lav_io.c ../config.h lav_io.h avilib.h
+lavaddwav.o: lavaddwav.c ../config.h lav_io.h ../utils/mjpeg_logging.h \
+	../utils/mjpeg_types.h
+lavpipe.o: lavpipe.c ../utils/mjpeg_logging.h ../utils/mjpeg_types.h \
+	pipelist.h yuv4mpeg.h
+lavplay.o: lavplay.c ../config.h ../mjpeg/mjpeg.h \
+	../mjpeg/videodev_mjpeg.h lav_io.h editlist.h \
+	../utils/mjpeg_logging.h ../utils/mjpeg_types.h
+lavrec.o: lavrec.c ../config.h ../mjpeg/videodev_mjpeg.h frequencies.h \
+	lav_io.h ../utils/mjpeg_logging.h ../utils/mjpeg_types.h
+lavtrans.o: lavtrans.c lav_io.h editlist.h ../utils/mjpeg_logging.h \
+	../utils/mjpeg_types.h
+lavvideo.o: lavvideo.c ../mjpeg/videodev_mjpeg.h
+matteblend.flt.o: matteblend.flt.c yuv4mpeg.h
+pipelist.o: pipelist.c ../utils/mjpeg_logging.h ../utils/mjpeg_types.h \
+	pipelist.h
+testrec.o: testrec.c ../config.h
+transist.flt.o: transist.flt.c ../utils/mjpeg_logging.h \
+	../utils/mjpeg_types.h yuv4mpeg.h
+v4l-conf.o: v4l-conf.c
+xlav.o: xlav.c ../config.h xlav.h
+xlav_main.o: xlav_main.c ../config.h xlav.h ../utils/mjpeg_logging.h \
+	../utils/mjpeg_types.h
+ypipe.o: ypipe.c ../utils/mjpeg_logging.h ../utils/mjpeg_types.h \
+	yuv4mpeg.h
+yuv2lav.o: yuv2lav.c ../config.h ../utils/mjpeg_logging.h \
+	../utils/mjpeg_types.h yuv4mpeg.h jpegutils.h lav_io.h
+yuv4mpeg.o: yuv4mpeg.c ../utils/mjpeg_logging.h ../utils/mjpeg_types.h \
+	yuv4mpeg.h
+yuvmedianfilter.o: yuvmedianfilter.c ../utils/mjpeg_logging.h \
+	../utils/mjpeg_types.h
+yuvplay.o: yuvplay.c yuv4mpeg.h ../utils/mjpeg_logging.h \
+	../utils/mjpeg_types.h
+yuvscaler.o: yuvscaler.c lav_io.h editlist.h jpegutils.c \
+	../utils/mjpeg_logging.h ../utils/mjpeg_types.h yuvscaler.h
+
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am: install-libLIBRARIES install-binPROGRAMS
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am: uninstall-libLIBRARIES uninstall-binPROGRAMS
+uninstall: uninstall-am
+all-am: Makefile $(LIBRARIES) $(PROGRAMS)
+all-redirect: all-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-libLIBRARIES mostlyclean-compile \
+		mostlyclean-binPROGRAMS mostlyclean-tags \
+		mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-libLIBRARIES clean-compile clean-binPROGRAMS clean-tags \
+		clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-libLIBRARIES distclean-compile \
+		distclean-binPROGRAMS distclean-tags distclean-generic \
+		clean-am
+
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-libLIBRARIES \
+		maintainer-clean-compile maintainer-clean-binPROGRAMS \
+		maintainer-clean-tags maintainer-clean-generic \
+		distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: mostlyclean-libLIBRARIES distclean-libLIBRARIES \
+clean-libLIBRARIES maintainer-clean-libLIBRARIES uninstall-libLIBRARIES \
+install-libLIBRARIES mostlyclean-compile distclean-compile \
+clean-compile maintainer-clean-compile mostlyclean-binPROGRAMS \
+distclean-binPROGRAMS clean-binPROGRAMS maintainer-clean-binPROGRAMS \
+uninstall-binPROGRAMS install-binPROGRAMS tags mostlyclean-tags \
+distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Naur original/mjpegtools-1.4.1/lavtools/Makefile.am patched/mjpegtools-1.4.1/lavtools/Makefile.am
--- original/mjpegtools-1.4.1/lavtools/Makefile.am	Sat May 12 03:11:38 2001
+++ patched/mjpegtools-1.4.1/lavtools/Makefile.am	Mon Aug 27 15:56:19 2001
@@ -22,63 +22,63 @@
 lav_headers = lav_io.h editlist.h xlav.h avilib.h yuv4mpeg.h jpegutils.h yuvscaler.h
 
 ypipe_SOURCES = ypipe.c yuv4mpeg.c $(lav_headers)
-ypipe_LDADD =  -L$(top_srcdir)/utils -lutils
+ypipe_LDADD =  $(top_srcdir)/utils/libutils.a
 
 yuv2lav_SOURCES = yuv2lav.c jpegutils.c yuv4mpeg.c $(lav_headers)
-yuv2lav_LDADD = -L$(top_builddir)/lavtools -lavio $(MOVTAR_LIBS) \
-       $(QUICKTIME_LIBS) $(JPEG_LIBS)  -L$(top_srcdir)/utils -lutils
+yuv2lav_LDADD = $(top_builddir)/lavtools/libavio.a $(MOVTAR_LIBS) \
+       $(QUICKTIME_LIBS) $(JPEG_LIBS)  $(top_srcdir)/utils/libutils.a
 
 transist_flt_SOURCES = transist.flt.c yuv4mpeg.c ${lav_headers}
-transist_flt_LDADD =  -L$(top_srcdir)/utils -lutils
+transist_flt_LDADD =  $(top_srcdir)/utils/libutils.a
 
 matteblend_flt_SOURCES = matteblend.flt.c yuv4mpeg.c ${lav_headers}
-matteblend_flt_LDADD =  -L$(top_srcdir)/utils -lutils
+matteblend_flt_LDADD =  $(top_srcdir)/utils/libutils.a
 
 lavplay_SOURCES = lavplay.c avilib.c audiolib.c lav_io.c editlist.c  $(lav_headers)
-lavplay_LDADD = -L$(top_builddir)/mjpeg -lmjpeg $(PTHREAD_LIBS) \
+lavplay_LDADD = $(top_builddir)/mjpeg/libmjpeg.a $(PTHREAD_LIBS) \
 	$(QUICKTIME_LIBS) $(MOVTAR_LIBS) $(SDL_LIBS) $(JPEG_LIBS) \
-	-L$(top_srcdir)/utils -lutils
+	$(top_srcdir)/utils/libutils.a
 
 lavrec_SOURCES = lavrec.c avilib.c audiolib.c lav_io.c frequencies.c \
         frequencies.h $(lav_headers)
-lavrec_LDADD = -L$(top_builddir)/mjpeg -lmjpeg $(PTHREAD_LIBS) \
+lavrec_LDADD = $(top_builddir)/mjpeg/libmjpeg.a $(PTHREAD_LIBS) \
 	$(QUICKTIME_LIBS) $(MOVTAR_LIBS) $(JPEG_LIBS) \
-	-L$(top_srcdir)/utils -lutils
+	$(top_srcdir)/utils/libutils.a
 
 testrec_SOURCES = testrec.c  audiolib.c  $(lav_headers)
-testrec_LDADD = $(PTHREAD_LIBS) -L$(top_srcdir)/utils -lutils
+testrec_LDADD = $(PTHREAD_LIBS) $(top_srcdir)/utils/libutils.a
 
 lav2yuv_SOURCES = lav2yuv.c  jpegutils.c yuv4mpeg.c $(lav_headers)
-lav2yuv_LDADD = -L$(top_builddir)/lavtools -lavio $(QUICKTIME_LIBS) \
-	$(MOVTAR_LIBS) 	$(JPEG_LIBS) -L$(top_srcdir)/utils -lutils
+lav2yuv_LDADD = $(top_builddir)/lavtools/libavio.a $(QUICKTIME_LIBS) \
+	$(MOVTAR_LIBS) 	$(JPEG_LIBS) $(top_srcdir)/utils/libutils.a
 
 lavpipe_SOURCES = lavpipe.c yuv4mpeg.c pipelist.c pipelist.h $(lav_headers)
-lavpipe_LDADD = -L$(top_srcdir)/utils -lutils
+lavpipe_LDADD = $(top_srcdir)/utils/libutils.a
 
 yuvmedianfilter_SOURCES = yuvmedianfilter.c $(lav_headers)
-yuvmedianfilter_LDFLAGS = -L$(top_builddir)/lavtools 
-yuvmedianfilter_LDADD =  -L$(top_srcdir)/utils -lutils
+yuvmedianfilter_LDFLAGS = $(top_builddir)/lavtools/libavio.a
+yuvmedianfilter_LDADD =  $(top_srcdir)/utils/libutils.a
 
 lav2wav_SOURCES = lav2wav.c  $(lav_headers)
-lav2wav_LDADD = -L$(top_builddir)/lavtools -lavio $(MOVTAR_LIBS) \
-	$(QUICKTIME_LIBS) $(JPEG_LIBS) -L$(top_srcdir)/utils -lutils
+lav2wav_LDADD = $(top_builddir)/lavtools/libavio.a $(MOVTAR_LIBS) \
+	$(QUICKTIME_LIBS) $(JPEG_LIBS) $(top_srcdir)/utils/libutils.a
 
 lavtrans_SOURCES = lavtrans.c $(lav_headers)
-lavtrans_LDADD = -L$(top_builddir)/lavtools -lavio $(MOVTAR_LIBS) \
-	$(QUICKTIME_LIBS) $(JPEG_LIBS) -L$(top_srcdir)/utils -lutils
+lavtrans_LDADD = $(top_builddir)/lavtools/libavio.a $(MOVTAR_LIBS) \
+	$(QUICKTIME_LIBS) $(JPEG_LIBS) $(top_srcdir)/utils/libutils.a
 
 lavaddwav_SOURCES = lavaddwav.c $(lav_headers)
-lavaddwav_LDADD = -L$(top_builddir)/lavtools -lavio $(MOVTAR_LIBS) \
-		$(QUICKTIME_LIBS) $(JPEG_LIBS) -L$(top_srcdir)/utils -lutils
+lavaddwav_LDADD = $(top_builddir)/lavtools/libavio.a $(MOVTAR_LIBS) \
+		$(QUICKTIME_LIBS) $(JPEG_LIBS) $(top_srcdir)/utils/libutils.a
 
 xlav_SOURCES = xlav.c xlav_main.c  $(lav_headers)
-xlav_LDADD = $(X_LIBS) -lX11 $(FORMS_LIBS) $(X_EXTRA_LIBS) -L$(top_srcdir)/utils -lutils
+xlav_LDADD = $(X_LIBS) -lX11 $(FORMS_LIBS) $(X_EXTRA_LIBS) $(top_srcdir)/utils/libutils.a
 
 lavvideo_SOURCES = lavvideo.c
 
 yuvscaler_SOURCES = yuvscaler.c editlist.c lav_io.c $(lav_headers)
-yuvscaler_LDADD = -L$(top_builddir)/lavtools -lavio $(MOVTAR_LIBS) \
-	$(QUICKTIME_LIBS) $(JPEG_LIBS) -L$(top_srcdir)/utils -lutils
+yuvscaler_LDADD = $(top_builddir)/lavtools/libavio.a $(MOVTAR_LIBS) \
+	$(QUICKTIME_LIBS) $(JPEG_LIBS) $(top_srcdir)/utils/libutils.a
 
 yuvplay_SOURCES = yuvplay.c yuv4mpeg.h yuv4mpeg.c
-yuvplay_LDADD = $(SDL_LIBS) $(PTHREAD_LIBS) -L$(top_srcdir)/utils -lutils
+yuvplay_LDADD = $(SDL_LIBS) $(PTHREAD_LIBS) $(top_srcdir)/utils/libutils.a
diff -Naur original/mjpegtools-1.4.1/lavtools/Makefile.in patched/mjpegtools-1.4.1/lavtools/Makefile.in
--- original/mjpegtools-1.4.1/lavtools/Makefile.in	Mon Jun 25 02:18:06 2001
+++ patched/mjpegtools-1.4.1/lavtools/Makefile.in	Mon Aug 27 15:56:19 2001
@@ -106,70 +106,70 @@
 # *********************************************************************
 # The tools themselves
 
-bin_PROGRAMS =  	lavplay   lavrec   lav2wav  lav2yuv yuvmedianfilter lavaddwav 	lavvideo  lavtrans xlav  ypipe yuv2lav testrec  	transist.flt matteblend.flt lavpipe yuvscaler yuvplay
+bin_PROGRAMS =  	lav2wav  lav2yuv yuvmedianfilter lavaddwav 	lavtrans ypipe yuv2lav  	transist.flt matteblend.flt lavpipe yuvscaler yuvplay
 
 
 lav_headers = lav_io.h editlist.h xlav.h avilib.h yuv4mpeg.h jpegutils.h yuvscaler.h
 
 ypipe_SOURCES = ypipe.c yuv4mpeg.c $(lav_headers)
-ypipe_LDADD = -L$(top_srcdir)/utils -lutils
+ypipe_LDADD = $(top_srcdir)/utils/libutils.a
 
 yuv2lav_SOURCES = yuv2lav.c jpegutils.c yuv4mpeg.c $(lav_headers)
-yuv2lav_LDADD = -L$(top_builddir)/lavtools -lavio $(MOVTAR_LIBS)        $(QUICKTIME_LIBS) $(JPEG_LIBS)  -L$(top_srcdir)/utils -lutils
+yuv2lav_LDADD = $(top_builddir)/lavtools/libavio.a $(MOVTAR_LIBS)        $(QUICKTIME_LIBS) $(JPEG_LIBS)  $(top_srcdir)/utils/libutils.a
 
 
 transist_flt_SOURCES = transist.flt.c yuv4mpeg.c ${lav_headers}
-transist_flt_LDADD = -L$(top_srcdir)/utils -lutils
+transist_flt_LDADD = $(top_srcdir)/utils/libutils.a
 
 matteblend_flt_SOURCES = matteblend.flt.c yuv4mpeg.c ${lav_headers}
-matteblend_flt_LDADD = -L$(top_srcdir)/utils -lutils
+matteblend_flt_LDADD = $(top_srcdir)/utils/libutils.a
 
 lavplay_SOURCES = lavplay.c avilib.c audiolib.c lav_io.c editlist.c  $(lav_headers)
-lavplay_LDADD = -L$(top_builddir)/mjpeg -lmjpeg $(PTHREAD_LIBS) 	$(QUICKTIME_LIBS) $(MOVTAR_LIBS) $(SDL_LIBS) $(JPEG_LIBS) 	-L$(top_srcdir)/utils -lutils
+lavplay_LDADD = $(top_builddir)/mjpeg/libmjpeg.a $(PTHREAD_LIBS) 	$(QUICKTIME_LIBS) $(MOVTAR_LIBS) $(SDL_LIBS) $(JPEG_LIBS) 	$(top_srcdir)/utils/libutils.a
 
 
 lavrec_SOURCES = lavrec.c avilib.c audiolib.c lav_io.c frequencies.c         frequencies.h $(lav_headers)
 
-lavrec_LDADD = -L$(top_builddir)/mjpeg -lmjpeg $(PTHREAD_LIBS) 	$(QUICKTIME_LIBS) $(MOVTAR_LIBS) $(JPEG_LIBS) 	-L$(top_srcdir)/utils -lutils
+lavrec_LDADD = $(top_builddir)/mjpeg/libmjpeg.a $(PTHREAD_LIBS) 	$(QUICKTIME_LIBS) $(MOVTAR_LIBS) $(JPEG_LIBS) 	$(top_srcdir)/utils/libutils.a
 
 
 testrec_SOURCES = testrec.c  audiolib.c  $(lav_headers)
-testrec_LDADD = $(PTHREAD_LIBS) -L$(top_srcdir)/utils -lutils
+testrec_LDADD = $(PTHREAD_LIBS) $(top_srcdir)/utils/libutils.a
 
 lav2yuv_SOURCES = lav2yuv.c  jpegutils.c yuv4mpeg.c $(lav_headers)
-lav2yuv_LDADD = -L$(top_builddir)/lavtools -lavio $(QUICKTIME_LIBS) 	$(MOVTAR_LIBS) 	$(JPEG_LIBS) -L$(top_srcdir)/utils -lutils
+lav2yuv_LDADD = $(top_builddir)/lavtools/libavio.a $(QUICKTIME_LIBS) 	$(MOVTAR_LIBS) 	$(JPEG_LIBS) $(top_srcdir)/utils/libutils.a
 
 
 lavpipe_SOURCES = lavpipe.c yuv4mpeg.c pipelist.c pipelist.h $(lav_headers)
-lavpipe_LDADD = -L$(top_srcdir)/utils -lutils
+lavpipe_LDADD = $(top_srcdir)/utils/libutils.a
 
 yuvmedianfilter_SOURCES = yuvmedianfilter.c $(lav_headers)
 yuvmedianfilter_LDFLAGS = -L$(top_builddir)/lavtools 
-yuvmedianfilter_LDADD = -L$(top_srcdir)/utils -lutils
+yuvmedianfilter_LDADD = $(top_srcdir)/utils/libutils.a
 
 lav2wav_SOURCES = lav2wav.c  $(lav_headers)
-lav2wav_LDADD = -L$(top_builddir)/lavtools -lavio $(MOVTAR_LIBS) 	$(QUICKTIME_LIBS) $(JPEG_LIBS) -L$(top_srcdir)/utils -lutils
+lav2wav_LDADD = $(top_builddir)/lavtools/libavio.a $(MOVTAR_LIBS) 	$(QUICKTIME_LIBS) $(JPEG_LIBS) $(top_srcdir)/utils/libutils.a
 
 
 lavtrans_SOURCES = lavtrans.c $(lav_headers)
-lavtrans_LDADD = -L$(top_builddir)/lavtools -lavio $(MOVTAR_LIBS) 	$(QUICKTIME_LIBS) $(JPEG_LIBS) -L$(top_srcdir)/utils -lutils
+lavtrans_LDADD = $(top_builddir)/lavtools/libavio.a $(MOVTAR_LIBS) 	$(QUICKTIME_LIBS) $(JPEG_LIBS) $(top_srcdir)/utils/libutils.a
 
 
 lavaddwav_SOURCES = lavaddwav.c $(lav_headers)
-lavaddwav_LDADD = -L$(top_builddir)/lavtools -lavio $(MOVTAR_LIBS) 		$(QUICKTIME_LIBS) $(JPEG_LIBS) -L$(top_srcdir)/utils -lutils
+lavaddwav_LDADD = $(top_builddir)/lavtools/libavio.a $(MOVTAR_LIBS) 		$(QUICKTIME_LIBS) $(JPEG_LIBS) $(top_srcdir)/utils/libutils.a
 
 
 xlav_SOURCES = xlav.c xlav_main.c  $(lav_headers)
-xlav_LDADD = $(X_LIBS) -lX11 $(FORMS_LIBS) $(X_EXTRA_LIBS) -L$(top_srcdir)/utils -lutils
+xlav_LDADD = $(X_LIBS) -lX11 $(FORMS_LIBS) $(X_EXTRA_LIBS) $(top_srcdir)/utils/libutils.a
 
 lavvideo_SOURCES = lavvideo.c
 
 yuvscaler_SOURCES = yuvscaler.c editlist.c lav_io.c $(lav_headers)
-yuvscaler_LDADD = -L$(top_builddir)/lavtools -lavio $(MOVTAR_LIBS) 	$(QUICKTIME_LIBS) $(JPEG_LIBS) -L$(top_srcdir)/utils -lutils
+yuvscaler_LDADD = $(top_builddir)/lavtools/libavio.a $(MOVTAR_LIBS) 	$(QUICKTIME_LIBS) $(JPEG_LIBS) $(top_srcdir)/utils/libutils.a
 
 
 yuvplay_SOURCES = yuvplay.c yuv4mpeg.h yuv4mpeg.c
-yuvplay_LDADD = $(SDL_LIBS) $(PTHREAD_LIBS) -L$(top_srcdir)/utils -lutils
+yuvplay_LDADD = $(SDL_LIBS) $(top_srcdir)/utils/libutils.a
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -408,7 +408,7 @@
 
 yuvplay: $(yuvplay_OBJECTS) $(yuvplay_DEPENDENCIES)
 	@rm -f yuvplay
-	$(LINK) $(yuvplay_LDFLAGS) $(yuvplay_OBJECTS) $(yuvplay_LDADD) $(LIBS)
+	$(LINK) $(yuvplay_LDFLAGS) $(yuvplay_OBJECTS) $(yuvplay_LDADD)
 
 tags: TAGS
 
diff -Naur original/mjpegtools-1.4.1/lavtools/audiolib.c patched/mjpegtools-1.4.1/lavtools/audiolib.c
--- original/mjpegtools-1.4.1/lavtools/audiolib.c	Sat Apr 28 08:24:05 2001
+++ patched/mjpegtools-1.4.1/lavtools/audiolib.c	Mon Aug 27 15:56:20 2001
@@ -34,13 +34,15 @@
 #include <signal.h>
 #include <string.h>
 #include <errno.h>
+#if !defined(__APPLE__)
 #include <linux/soundcard.h>
+#endif
+#include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/ioctl.h>
-#include <sys/time.h>
 
 #include "mjpeg_logging.h"
 
@@ -210,6 +212,7 @@
 
    if(initialized) { audio_errno = AUDIO_ERR_INIT2; return -1; }
 
+#if !defined(__APPLE__)
    /* Checks of parameters */
 
    if (a_size != 8 && a_size != 16) { audio_errno = AUDIO_ERR_ASIZE; return -1; }
@@ -348,6 +351,7 @@
       usleep(10000);
    }
 
+#endif
    initialized = 1;
    return 0;
 }
@@ -366,6 +370,7 @@
 {
    if(!initialized) return;
 
+#if !defined(__APPLE__)
    /* show the child we want to exit */
 
    shmemptr->exit_flag = 1;
@@ -374,6 +379,7 @@
 #else
    pthread_join( capture_thread, NULL );
 #endif
+#endif
 
    initialized = 0;
 }
@@ -468,6 +474,7 @@
 {
    if(!initialized) { audio_errno = AUDIO_ERR_INIT; return -1; }
 
+#if !defined(__APPLE__)
    /* Is audio task still ok ? */
 
    if(shmemptr->audio_status < 0) { audio_errno = AUDIO_ERR_ATASK; return -1; }
@@ -501,11 +508,13 @@
       return audio_buffer_size;
    }
 
+#endif
    return 0;
 }
 
 static void update_output_status()
 {
+#if !defined(__APPLE__)
    while(shmemptr->status[NBUF(n_buffs_output)])
    {
       if(shmemptr->status[NBUF(n_buffs_output)] < 0) n_buffs_error++;
@@ -513,6 +522,7 @@
       shmemptr->status[NBUF(n_buffs_output)] = 0;
       n_buffs_output++;
    }
+#endif
 }
 
 void audio_get_output_status(struct timeval *tmstmp, int *nb_out, int *nb_err)
@@ -545,6 +555,7 @@
 
    if(!initialized) { audio_errno = AUDIO_ERR_INIT; return -1; }
 
+#if !defined(__APPLE__)
    /* Is audio task still ok ? */
 
    if(shmemptr->audio_status < 0) { audio_errno = AUDIO_ERR_ATASK; return -1; }
@@ -618,6 +629,7 @@
       memcpy(audio_left_buf,buf+nb,audio_bytes_left);
    }
 
+#endif
    return size;
 }
 
@@ -627,6 +639,7 @@
 
 static void system_error(char *str, int use_strerror)
 {
+#if !defined(__APPLE__)
    if(use_strerror)
       sprintf((char*)shmemptr->error_string,"Error %s - %s",str,strerror(errno));
    else
@@ -638,10 +651,12 @@
 #else
 	  pthread_exit(NULL);
 #endif
+#endif
 }
 
 void do_audio(void)
 {
+#if !defined(__APPLE__)
 
    int fd, tmp, ret, caps, afmt, frag;
    int nbdone, nbque, ndiff, nbpend, nbset, maxdiff;
@@ -1036,7 +1051,7 @@
          }
       }
    }
+#endif
 }
-
 
 
diff -Naur original/mjpegtools-1.4.1/lavtools/lav2wav.c patched/mjpegtools-1.4.1/lavtools/lav2wav.c
--- original/mjpegtools-1.4.1/lavtools/lav2wav.c	Thu May  3 01:43:30 2001
+++ patched/mjpegtools-1.4.1/lavtools/lav2wav.c	Mon Aug 27 15:56:19 2001
@@ -109,15 +109,15 @@
 	strncpy(wave.riff.id, "RIFF", 4);
 	strncpy(wave.riff.wave_id, "WAVE",4);
 	strncpy(wave.format.id, "fmt ",4);
-	wave.format.len = sizeof(struct common_struct);
+	wave.format.len = bswap_32(sizeof(struct common_struct));
 
 	/* Store information */
-	wave.common.wFormatTag = WAVE_FORMAT_PCM;
-	wave.common.wChannels = channels;
-	wave.common.dwSamplesPerSec = rate;
-	wave.common.dwAvgBytesPerSec = channels*rate*bits/8;
-	wave.common.wBlockAlign = channels*bits/8;
-	wave.common.wBitsPerSample = bits;
+	wave.common.wFormatTag = bswap_16(WAVE_FORMAT_PCM);
+	wave.common.wChannels = bswap_16(channels);
+	wave.common.dwSamplesPerSec = bswap_32(rate);
+	wave.common.dwAvgBytesPerSec = bswap_32(channels*rate*bits/8);
+	wave.common.wBlockAlign = bswap_16(channels*bits/8);
+	wave.common.wBitsPerSample = bswap_16(bits);
 
 	strncpy(wave.data.id, "data",4);
 	if (do_write(fd, &wave, sizeof(wave)) != sizeof(wave)) 
@@ -156,9 +156,9 @@
 
 	// Fill out our wav-header with some information. 
 	size -= 8;
-	wave.riff.len = size;
+	wave.riff.len = bswap_32(size);
 	size -= 20+sizeof(struct common_struct);
-	wave.data.len = size;
+	wave.data.len = bswap_32(size);
 
 	if (do_write(fd, &wave, sizeof(wave)) < sizeof(wave)) 
 	{
diff -Naur original/mjpegtools-1.4.1/lavtools/lav2yuv.c patched/mjpegtools-1.4.1/lavtools/lav2yuv.c
--- original/mjpegtools-1.4.1/lavtools/lav2yuv.c	Wed Jun 13 12:33:11 2001
+++ patched/mjpegtools-1.4.1/lavtools/lav2yuv.c	Mon Aug 27 15:56:19 2001
@@ -174,7 +174,7 @@
    char *buf = malloc(size + BUFFER_ALIGN);
    int adjust;
    if (buf == NULL) {
-      error("malloc failed\n");
+      mjpeg_error_exit1("malloc failed\n");
    }
    adjust = BUFFER_ALIGN - ((int) buf) % BUFFER_ALIGN;
    if (adjust == BUFFER_ALIGN)
diff -Naur original/mjpegtools-1.4.1/lavtools/lavplay.c patched/mjpegtools-1.4.1/lavtools/lavplay.c
--- original/mjpegtools-1.4.1/lavtools/lavplay.c	Sun May 27 09:12:01 2001
+++ patched/mjpegtools-1.4.1/lavtools/lavplay.c	Mon Aug 27 15:56:19 2001
@@ -139,7 +139,7 @@
 #define LAVPLAY_VSTR "lavplay" LAVPLAY_VERSION  /* Expected version info */
 
 char *audio_strerror(void);
-void malloc_error(void);
+static void malloc_error(void);
 void sig_cont(int sig);
 int queue_next_frame(char *vbuff, int skip_video, int skip_audio, int skip_incr);
 void Usage(char *progname);
@@ -252,7 +252,7 @@
 
 /* Since we use malloc often, here the error handling */
 
-void malloc_error(void)
+static void malloc_error(void)
 {
    mjpeg_error_exit1("Out of memory - malloc failed\n");
 }
@@ -616,7 +616,9 @@
 	struct mjpeg_params bp;
 	struct mjpeg_sync bs;
 	struct sigaction action, old_action;
+#if !defined(__APPLE__)
 	struct video_capability vc;
+#endif
 
    /* Output Version information - Used by xlav to check for
 	consistency. 
@@ -702,7 +704,7 @@
 		case 'Z':
             soft_fullscreen = 1;
             break;
-
+#if !defined(__APPLE__)
 		case 'H':
 			mjpeg_info("Choosing hardware MJPEG playback (on-screen)\n");
             screen_output = 1;
@@ -713,6 +715,7 @@
             screen_output = 0;
 			soft_play = 0;
             break;
+#endif
 		}
 	}
 
@@ -722,6 +725,12 @@
 
 	mjpeg_default_handler_verbosity(verbose);
 
+#if defined(__APPLE__)
+        soft_play = 1;
+	screen_output = 0;
+        audio_enable = 0;
+#endif
+
 	/* Get and open input files */
 
 	read_video_files(argv + optind, argc - optind, &el);
@@ -759,11 +768,13 @@
 
 	if (soft_play)
 		mjpeg = mjpeg_open(MJPEG_OUTPUT_SOFTWARE, MJPG_nbufs, el.max_frame_size);
+#if !defined(__APPLE__)
 	else 
 		if (screen_output)
 			mjpeg = mjpeg_open(MJPEG_OUTPUT_HARDWARE_SCREEN, MJPG_nbufs, el.max_frame_size);
 		else
 			mjpeg = mjpeg_open(MJPEG_OUTPUT_HARDWARE_VIDEO, MJPG_nbufs, el.max_frame_size);
+#endif
 
 	buff = mjpeg_get_io_buffer(mjpeg);
 
@@ -865,14 +876,17 @@
    
 	bp.input = 0;
 
+#if !defined(__APPLE__)
    /* Set norm */       
 	bp.norm = (el.video_norm == 'n') ? VIDEO_MODE_NTSC : VIDEO_MODE_PAL;
 	mjpeg_info("Output norm: %s\n",bp.norm?"NTSC":"PAL");
    
 	hn = bp.norm ? 480 : 576;  /* Height of norm */
+#endif
    
 	bp.decimation = 0; /* we will set proper params ourselves */
 
+#if !defined(__APPLE__)
 	/* Check dimensions of video, select decimation factors */
 	if (!soft_play && !screen_output)
 	{		
@@ -891,6 +905,7 @@
 					el.video_width,el.video_height);
 		}
 	}
+#endif
        
 	/* if zoom_to_fit is set, HorDcm is independent of interlacing */
        
@@ -932,6 +947,7 @@
 		bp.field_per_buff = 1;
 		bp.TmpDcm = 2;
        
+#if !defined(__APPLE__)
 		if (!soft_play && !screen_output &&  
 			( el.video_height > hn/2 || (!zoom_to_fit && el.video_width>playback_width/2) ))
 		{
@@ -942,6 +958,7 @@
 				mjpeg_error("Try -z option !!!!\n");
 			exit(1);
 		}
+#endif
        
 		if(zoom_to_fit)
 		{
diff -Naur original/mjpegtools-1.4.1/lavtools/lavtrans.c patched/mjpegtools-1.4.1/lavtools/lavtrans.c
--- original/mjpegtools-1.4.1/lavtools/lavtrans.c	Sat May  5 08:59:29 2001
+++ patched/mjpegtools-1.4.1/lavtools/lavtrans.c	Mon Aug 27 15:56:19 2001
@@ -53,6 +53,7 @@
 */
 
 
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
@@ -70,7 +71,11 @@
 
 static int process_image_frame = -1; /* All, >-1 means not all */
 
+#ifdef WORDS_BIGENDIAN
+#define FOURCC(a,b,c,d) ( (a<<24) | ((b&0xff)<<16) | ((c&0xff)<<8) | (d&0xff) )
+#else
 #define FOURCC(a,b,c,d) ( (d<<24) | ((c&0xff)<<16) | ((b&0xff)<<8) | (a&0xff) )
+#endif
 
 #define FOURCC_RIFF     FOURCC ('R', 'I', 'F', 'F')
 #define FOURCC_WAVE     FOURCC ('W', 'A', 'V', 'E')
@@ -217,13 +222,13 @@
       wave_hdr.rifflen = 0; /* to be filled later */
       wave_hdr.wavetag = FOURCC_WAVE;
       wave_hdr.fmt_tag = FOURCC_FMT;
-      wave_hdr.fmt_len = 16;
-         wave_hdr.wFormatTag      = 1;  /* PCM */
-         wave_hdr.nChannels       = forcestereo ? 2 : el.audio_chans;
-         wave_hdr.nSamplesPerSec  = el.audio_rate;
-         wave_hdr.nAvgBytesPerSec = el.audio_rate*el.audio_bps;
-         wave_hdr.nBlockAlign     = el.audio_bps;
-         wave_hdr.wBitsPerSample  = el.audio_bits;
+      wave_hdr.fmt_len = bswap_32(16);
+         wave_hdr.wFormatTag      = bswap_16(1);  /* PCM */
+         wave_hdr.nChannels       = bswap_16(forcestereo ? 2 : el.audio_chans);
+         wave_hdr.nSamplesPerSec  = bswap_32(el.audio_rate);
+         wave_hdr.nAvgBytesPerSec = bswap_32(el.audio_rate*el.audio_bps);
+         wave_hdr.nBlockAlign     = bswap_16(el.audio_bps);
+         wave_hdr.wBitsPerSample  = bswap_16(el.audio_bits);
       wave_hdr.datatag = FOURCC_DATA;
       wave_hdr.datalen = 0; /* to be filled later */
       
@@ -316,8 +321,8 @@
 
    if(format == 'w' || format == 'W')
    {
-      wave_hdr.rifflen = sizeof(wave_hdr) - 8 + audio_bytes_out;
-      wave_hdr.datalen = audio_bytes_out;
+      wave_hdr.rifflen = bswap_32(sizeof(wave_hdr) - 8 + audio_bytes_out);
+      wave_hdr.datalen = bswap_32(audio_bytes_out);
       res = fseek(wavfd,0,SEEK_SET);
       if(res) system_error("writing WAV file","fseek");
       res = fwrite(&wave_hdr,sizeof(wave_hdr),1,wavfd);
diff -Naur original/mjpegtools-1.4.1/lavtools/yuvmedianfilter.c patched/mjpegtools-1.4.1/lavtools/yuvmedianfilter.c
--- original/mjpegtools-1.4.1/lavtools/yuvmedianfilter.c	Sat May  5 09:03:13 2001
+++ patched/mjpegtools-1.4.1/lavtools/yuvmedianfilter.c	Mon Aug 27 15:56:19 2001
@@ -27,6 +27,10 @@
 
 #include "mjpeg_logging.h"
 
+#ifdef __APPLE__
+#define alloca malloc
+#endif
+
 #define	CHROMA420 1
 #define	CHROMA422 2
 #define	CHROMA444 3
diff -Naur original/mjpegtools-1.4.1/lavtools/yuvplay.c patched/mjpegtools-1.4.1/lavtools/yuvplay.c
--- original/mjpegtools-1.4.1/lavtools/yuvplay.c	Sun May  6 14:39:58 2001
+++ patched/mjpegtools-1.4.1/lavtools/yuvplay.c	Mon Aug 27 15:56:19 2001
@@ -126,6 +126,7 @@
       mjpeg_log(LOG_ERROR, "Couldn't initialize SDL: %s\n", SDL_GetError());
       exit(1);
    }
+   atexit(SDL_Quit);
 
    /* yuv params */
    yuv[0] = malloc(width * height * sizeof(unsigned char));
diff -Naur original/mjpegtools-1.4.1/lavtools/yuvscaler.c patched/mjpegtools-1.4.1/lavtools/yuvscaler.c
--- original/mjpegtools-1.4.1/lavtools/yuvscaler.c	Sun Jun 10 08:21:14 2001
+++ patched/mjpegtools-1.4.1/lavtools/yuvscaler.c	Mon Aug 27 15:56:19 2001
@@ -25,6 +25,9 @@
 #include "inttypes.h"
 #include "yuvscaler.h"
 
+#if defined __APPLE__
+#define alloca malloc
+#endif
 
 // For input
 unsigned int input_width;
diff -Naur original/mjpegtools-1.4.1/mjpeg/Makefile patched/mjpegtools-1.4.1/mjpeg/Makefile
--- original/mjpegtools-1.4.1/mjpeg/Makefile	Wed Dec 31 18:00:00 1969
+++ patched/mjpegtools-1.4.1/mjpeg/Makefile	Mon Aug 27 15:56:20 2001
@@ -0,0 +1,293 @@
+# Generated automatically from Makefile.in by configure.
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Process this file with Automake to produce Makefile.in
+
+
+SHELL = /bin/sh
+
+srcdir = .
+top_srcdir = ..
+prefix = /usr/local
+exec_prefix = ${prefix}
+
+bindir = ${exec_prefix}/bin
+sbindir = ${exec_prefix}/sbin
+libexecdir = ${exec_prefix}/libexec
+datadir = ${prefix}/share
+sysconfdir = ${prefix}/etc
+sharedstatedir = ${prefix}/com
+localstatedir = ${prefix}/var
+libdir = ${exec_prefix}/lib
+infodir = ${prefix}/info
+mandir = ${prefix}/man
+includedir = ${prefix}/include
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/mjpegtools
+pkglibdir = $(libdir)/mjpegtools
+pkgincludedir = $(includedir)/mjpegtools
+
+top_builddir = ..
+
+ACLOCAL = /Users/Shared/Projects/Unix/mjpegtools-1.4.1/missing aclocal
+AUTOCONF = autoconf
+AUTOMAKE = /Users/Shared/Projects/Unix/mjpegtools-1.4.1/missing automake
+AUTOHEADER = autoheader
+
+INSTALL = /usr/bin/install -c
+INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_SCRIPT = ${INSTALL_PROGRAM}
+transform = s,x,x,
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = powerpc-apple-darwin1.3.7
+host_triplet = powerpc-apple-darwin1.3.7
+AWK = awk
+CC = gcc
+FORMS_LIBS = 
+GLIB_CFLAGS = -I/usr/local/include/glib-1.2 -I/usr/local/lib/glib/include
+GLIB_CONFIG = /usr/local/bin/glib-config
+GLIB_LIBS = -L/usr/local/lib -lglib
+JPEG_CFLAGS = 
+JPEG_LIBS = -ljpeg
+LN_S = ln -s
+MAINT = #
+MAKEINFO = /Users/Shared/Projects/Unix/mjpegtools-1.4.1/missing makeinfo
+MOVTAR_CFLAGS = -I/usr/include -I/usr/local/include -I/usr/local/include/glib-1.2 -I/usr/local/lib/glib/include
+MOVTAR_CONFIG = /usr/local/bin/movtar-config
+MOVTAR_LIBS = -L/usr/local/lib -L/usr/local/lib -lglib -lmovtar
+MOVTAR_VERSION = 0.1.2
+NASM = 
+NASMFLAGS = 
+PACKAGE = mjpegtools
+PTHREAD_LIBS = -lpthread
+QUICKTIME_CFLAGS = -I /usr/local/src/quicktime4linux-1.3
+QUICKTIME_LIBS = -L/usr/local/src/quicktime4linux-1.3 -lquicktime  -L/usr/local/lib -lglib  -lpthread  -lpng -ldl
+RANLIB = ranlib
+SDL_CFLAGS = -I/usr/local/include -I/usr/local/include/SDL -D_THREAD_SAFE -F/System/Library/Frameworks/Carbon.framework
+SDL_CONFIG = /usr/local/bin/sdl-config
+SDL_LIBS = -L/usr/local/lib -lSDLmain -lSDL -framework OpenGL -framework AGL -framework Carbon
+V4LCONF_LIBS = 
+VERSION = 1.4.1
+X_CFLAGS =  -I/usr/X11R6/include
+X_EXTRA_LIBS = 
+X_LIBS =  -L/usr/X11R6/lib
+X_PRE_LIBS =  -lSM -lICE
+x_libraries = /usr/X11R6/lib
+
+INCLUDES = -I$(top_srcdir)/utils $(JPEG_CFLAGS)
+
+noinst_LIBRARIES = libmjpeg.a
+
+libmjpeg_a_SOURCES = mjpeg.c jpeg_dec.c mjpeg.h videodev_mjpeg.h
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = ../config.h
+CONFIG_CLEAN_FILES = 
+LIBRARIES =  $(noinst_LIBRARIES)
+
+
+DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
+CPPFLAGS = 
+LDFLAGS = 
+LIBS = -lz
+libmjpeg_a_LIBADD = 
+libmjpeg_a_OBJECTS =  mjpeg.o jpeg_dec.o
+AR = ar
+CFLAGS =  -g -O2 -Wall -Wunused
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+DIST_COMMON =  Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+SOURCES = $(libmjpeg_a_SOURCES)
+OBJECTS = $(libmjpeg_a_OBJECTS)
+
+all: all-redirect
+.SUFFIXES:
+.SUFFIXES: .S .c .o .s
+$(srcdir)/Makefile.in: # Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps mjpeg/Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+mostlyclean-noinstLIBRARIES:
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+distclean-noinstLIBRARIES:
+
+maintainer-clean-noinstLIBRARIES:
+
+.c.o:
+	$(COMPILE) -c $<
+
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
+	$(COMPILE) -c $<
+
+mostlyclean-compile:
+	-rm -f *.o core *.core
+
+clean-compile:
+
+distclean-compile:
+	-rm -f *.tab.c
+
+maintainer-clean-compile:
+
+libmjpeg.a: $(libmjpeg_a_OBJECTS) $(libmjpeg_a_DEPENDENCIES)
+	-rm -f libmjpeg.a
+	$(AR) cru libmjpeg.a $(libmjpeg_a_OBJECTS) $(libmjpeg_a_LIBADD)
+	$(RANLIB) libmjpeg.a
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $$unique $(LISP)
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+	-rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = mjpeg
+
+distdir: $(DISTFILES)
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+jpeg_dec.o: jpeg_dec.c mjpeg.h ../config.h videodev_mjpeg.h
+mjpeg.o: mjpeg.c mjpeg.h ../config.h videodev_mjpeg.h \
+	../utils/mjpeg_logging.h ../utils/mjpeg_types.h
+
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile $(LIBRARIES)
+all-redirect: all-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
+		mostlyclean-tags mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
+		mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-noinstLIBRARIES distclean-compile \
+		distclean-tags distclean-generic clean-am
+
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
+		maintainer-clean-compile maintainer-clean-tags \
+		maintainer-clean-generic distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
+clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
+mostlyclean-compile distclean-compile clean-compile \
+maintainer-clean-compile tags mostlyclean-tags distclean-tags \
+clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+check-am installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Naur original/mjpegtools-1.4.1/mjpeg/jpeg_dec.c patched/mjpegtools-1.4.1/mjpeg/jpeg_dec.c
--- original/mjpegtools-1.4.1/mjpeg/jpeg_dec.c	Wed Apr 11 05:50:35 2001
+++ patched/mjpegtools-1.4.1/mjpeg/jpeg_dec.c	Mon Aug 27 15:56:20 2001
@@ -167,6 +167,7 @@
   }
 }
 
+#if defined(HAVE_MMX_INTEL_MNEMONICS)
 GLOBAL(void)
 ycc_rgb32_convert_mmx (j_decompress_ptr cinfo,
 		     JSAMPIMAGE input_buf, JDIMENSION input_