head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.36
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.34
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.32
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.30
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.28
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.26
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.24
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.22
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.20
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.18
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.16
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.14
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.12
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.10
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.8
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.6
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.4
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.3.0.2
	pkgsrc-2006Q1-base:1.3
	pkgsrc-2005Q4:1.2.0.14
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.12
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.10
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.8
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.2.0.6
	pkgsrc-2004Q4-base:1.2
	pkgsrc-2004Q3:1.2.0.4
	pkgsrc-2004Q3-base:1.2
	pkgsrc-2004Q2:1.2.0.2
	pkgsrc-2004Q2-base:1.2
	pkgsrc-2004Q1:1.1.1.1.0.2
	pkgsrc-2004Q1-base:1.1.1.1
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.3
date	2006.01.25.08.09.12;	author xtraeme;	state dead;
branches;
next	1.2;

1.2
date	2004.03.30.19.53.44;	author ben;	state Exp;
branches;
next	1.1;

1.1
date	2004.01.26.12.52.07;	author jmmv;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2004.01.26.12.52.07;	author jmmv;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Update mjpegtools/mplex to 1.8.0.

Some changes:

* Modularised input handling for MPEG compression tools.
* movtar read/write support
* MJPEG playback in software, and experimental MJPEG hardware
   overlay playback (see mjpeg/)
* mpeg2enc _much_ improved!
@
text
@$NetBSD: patch-aa,v 1.2 2004/03/30 19:53:44 ben Exp $

--- mplex/Makefile.in.orig	Tue Feb  3 14:58:31 2004
+++ mplex/Makefile.in
@@@@ -276,6 +276,7 @@@@ mplex_SOURCES = main.cpp 
 
 mplex_LDADD = \
 	$(top_builddir)/mplex/libmplex2.la \
+	$(top_builddir)/utils/libmjpegutils.a \
 	@@LIBGETOPT_LIB@@ $(LIBM_LIBS) 
 
 subdir = mplex
@


1.2
log
@Makefile fix required for mplex 1.6.2.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.1 2003/12/19 18:25:57 agc Exp $
d3 3
a5 7
--- mplex/multplex.cc	2003/12/19 18:16:29	1.1
+++ mplex/multplex.cc	2003/12/19 18:17:25
@@@@ -3,6 +3,7 @@@@
 #include <math.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <assert.h>
d7 6
a12 2
 #include <mjpeg_types.h>
 #include <mjpeg_logging.h>
@


1.1.1.1
log
@Move mplex to the multimedia category (coming from graphics).
This is version 1.6.0.
@
text
@@