Commit Graph

174 Commits

Author SHA1 Message Date
Laurent Aimar
d1c2156bc6 Fix an invalid free in the AVI muxer when an unsupported audio track is added.
patch by Laurent Aimar, fenrir via.ecp fr

Originally committed as revision 15159 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-02 22:53:42 +00:00
Reimar Döffinger
c18545929e Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const *
Originally committed as revision 14947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 16:51:50 +00:00
Aurelien Jacobs
5972945197 convert every muxer/demuxer to write/read sample_aspect_ratio from/to
the corresponding AVStream instead of AVCodecContext

Originally committed as revision 14933 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 23:43:20 +00:00
Stefano Sabatini
bde15e74de Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me

Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 16:20:54 +00:00
Michael Niedermayer
61559562f5 Fix aspect ratio.
fixes issue404
avienc.c change by StevieS

Originally committed as revision 12601 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-27 01:18:16 +00:00
Michael Niedermayer
5b08754912 Store aspect ratio in avis.
Originally committed as revision 12290 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-02 19:51:31 +00:00
Björn Axelsson
899681cd1d Use dynamically allocated ByteIOContext in AVFormatContext
patch by: Björn Axelsson, bjorn d axelsson a intinor d se
thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007

Originally committed as revision 11071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-21 07:41:00 +00:00
Måns Rullgård
7ea18c8c1e remove redundant codec_get_bmp_tag() call in avi_write_header()
it is incorrect and av_write_header() already does the right thing

Originally committed as revision 9527 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-08 01:41:06 +00:00
Michael Niedermayer
6c77805fc8 get rid of the [4] limitation of codec tag lists
Originally committed as revision 7596 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 12:08:31 +00:00
Michael Niedermayer
7caf0cc62c add codec_id <-> codec_tag tables to AVIn/OutputFormat
Originally committed as revision 7593 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 01:39:17 +00:00
Michael Niedermayer
5c4e1928c0 fix indention (dunno why it was messed up ...)
Originally committed as revision 7592 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-20 23:09:27 +00:00
Måns Rullgård
8da9266cea use the standard INT64_C() macro for 64-bit constants
Originally committed as revision 7240 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 23:46:11 +00:00
Steve L'Homme
949b1a13bf Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
patch by Steve Lhomme, slhomme divxcorp com

Originally committed as revision 6868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 22:39:58 +00:00
Aurelien Jacobs
7fbde3431a replace coder/decoder file description in libavformat by muxer/demuxer
Originally committed as revision 6774 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-23 08:57:54 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 15:30:46 +00:00
Måns Rullgård
191e8ca752 fix some signedness warnings
Originally committed as revision 6355 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-27 19:47:39 +00:00
Panagiotis Issaris
2eb291c4bb Allow to store the the track number though the IPRT (part) tag in AVI.
Patch by Panagiotis Issaris % takis P issaris A uhasselt P be%
Original thread:
Date: Sep 6, 2006 6:00 PM
Subject: [Ffmpeg-devel] [PATCH] Enable track tag in AVI

Originally committed as revision 6189 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-07 16:33:24 +00:00
Brian Brice
5bce834e84 fix ODML AVI Duration for files > 2GB
Patch by Brian Brice % bbrice A newtek P com %
Original thread:
Date: Aug 22, 2006 10:21 PM
Subject: [Ffmpeg-devel] [PATCH] ODML AVI Duration

Originally committed as revision 6063 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-24 08:22:26 +00:00
David Conrad
57060f8936 AVI tag reading and writing patch by David Conrad.
umovimus at gmail dot com

Originally committed as revision 6022 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-18 16:48:35 +00:00
Måns Rullgård
9d9f4119bd move common stuff from avienc.c and wav.c to new file riff.c
Originally committed as revision 5720 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-12 00:09:34 +00:00
Måns Rullgård
ff70e60176 allow individual selection of muxers and demuxers
Originally committed as revision 5707 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-10 21:14:37 +00:00
Måns Rullgård
d2a067d1d9 give AVInput/OutputFormat structs consistent names
Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-09 23:40:53 +00:00
Benjamin Larsson
0919e788ae Flash Screen Video decoder (fourcc:FSV1)
Originally committed as revision 5436 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-01 07:31:59 +00:00
Diego Biurrun
c4052af07d Add MPEG FourCC for MPEG-2 video.
Originally committed as revision 5391 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-17 21:52:38 +00:00
Kostya Shishkov
fd7b199199 KMVC (used in Worms games) decoder. Works fine with samples from MPHQ
Originally committed as revision 5273 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-07 16:59:57 +00:00
Michael Niedermayer
61452d5637 fixing total_frames
Originally committed as revision 5101 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-02 20:44:35 +00:00
Michael Niedermayer
98740f5a79 indention
Originally committed as revision 5100 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-02 20:08:01 +00:00
Benjamin Larsson
26d6d03270 Set 'MJLS' FOURCC for JPEG-LS in AVI and documentation fix. Patch by
kostya shishkov - gmail - com.

Originally committed as revision 5082 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-01 07:42:55 +00:00
Michael Niedermayer
9eb40bcf41 replace if by assert as it should never by true
Originally committed as revision 5080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-01 01:29:12 +00:00
Alex Beregszaszi
fb7a2bf695 check for CODEC_ID_NONE instead 0, tobe compatible with movenc.c and possible CODEC_ID_NONE value change
Originally committed as revision 5043 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-21 20:32:47 +00:00
Michael Niedermayer
c2ca19d7f9 RMP4 ("xvid fork") decoding support
Originally committed as revision 5035 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-19 10:20:27 +00:00
Mike Melanson
9c8d8e84e0 dosbox native ZMBV decoder, courtesy of Kostya
Originally committed as revision 5000 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-12 08:53:29 +00:00
Fabien Cosse
d9d434b839 Add fourcc "SEDG" for MPEG-4 files produced by Samsung VP-M110 Miniket
camcorder

Patch by Fabien Cosse *** fabien ! cosse !a! wanadoo ! fr ***

Originally committed as revision 4900 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-26 19:42:45 +00:00
Michael Niedermayer
82e415b1fc avoid using non constant fields of AVCodecContext in avi muxer
Originally committed as revision 4897 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-25 17:14:16 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address.
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 22:43:26 +00:00
Reimar Döffinger
e0f80bd744 CamStudio decoder, only 32 bit lzo mode is tested
Originally committed as revision 4836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-09 15:41:39 +00:00
Diego Biurrun
bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-22 01:10:11 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace.
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00
Guillaume Poirier
0bb0289c3a add some h.264 fourccs to codec_bmp_tags[]
Originally committed as revision 4712 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-11-30 10:50:13 +00:00
Alex Beregszaszi
a2a2668d57 Support for streaming: dont write indexes and dont signal HAS_INDEX in header. Also set filesize to max in this case.
Originally committed as revision 4698 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-11-13 03:32:12 +00:00
Mike Melanson
64af6168f7 Duck TrueMotion 2 video decoder, courtesy of Konstantin Shishkov
Originally committed as revision 4638 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-10-13 04:31:55 +00:00
Diego Biurrun
a9e3509529 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
in libavformat to allow building (de)coders and (de)muxers independently at
some point + support for this option in configure.

Originally committed as revision 4611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-09-23 00:25:41 +00:00
Michael Niedermayer
d57d8cbc25 a few more raw yuv fourccs
Originally committed as revision 4565 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-09-06 15:02:43 +00:00
Michael Niedermayer
01f4895c68 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
Originally committed as revision 4453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-17 22:24:36 +00:00
Roberto Togni
3a1d8db354 Theora fourcc
Originally committed as revision 4393 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-06-26 20:26:47 +00:00
Ronald S. Bultje
7dc1bea30f non-avc h264 stream problems patch by ("Ronald S. Bultje" rbultje, ronald bitfreak net)
Originally committed as revision 4368 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-06-09 20:01:02 +00:00
Michael Niedermayer
1d92cc2bf2 a step toward CODEC_TYPE_DATA support
remove a little duplicated code

Originally committed as revision 4342 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-06-03 08:50:46 +00:00
Mike Melanson
b81f89490f Fraps FPS1 video decoder (v1 & v2), courtesy of Roine Gustafsson <roine
at users sf net>

Originally committed as revision 4264 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-17 22:47:34 +00:00
Måns Rullgård
d3f28f0526 add VP30 fourcc
Originally committed as revision 4247 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-16 13:21:39 +00:00
Michael Niedermayer
c0df9d75bd switch to native time bases
Originally committed as revision 4168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-30 21:43:59 +00:00
Michael Niedermayer
856dbbff7f Indeo 2 decoder by (Kostya <> kostya.shishkov gmail com)
Originally committed as revision 4141 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-20 09:42:47 +00:00
Mike Melanson
589f82202c Autodesk Animator Studio Codec (AASC) video decoder, courtesy of
Konstantin Shishkov

Originally committed as revision 4099 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-03 05:02:08 +00:00
Michael Niedermayer
16543599cc fix vorbis in avi
Originally committed as revision 4098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-01 21:21:12 +00:00
Mike Melanson
a8a15e9db2 Winnov WNV1 video decoder, courtesy of Konstantin Shishkov
Originally committed as revision 4083 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-26 20:32:55 +00:00
Calcium
649b918c9f 29_vtag_in_ASF_not_effective.patch by (Calcium | calcium nurs or jp)
Originally committed as revision 4071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-23 12:42:12 +00:00
Michael Niedermayer
4a7d265176 sample_size fix
Originally committed as revision 4043 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-15 23:50:24 +00:00
Mike Melanson
9c7fb60816 go LOCO, courtesy of Kostya Shishkov
Originally committed as revision 3995 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-01 02:24:58 +00:00
Michael Niedermayer
420370d4aa switch MPEG4 fourcc to FMP4
Originally committed as revision 3972 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-22 19:48:07 +00:00
Michael Niedermayer
b636365a5e wmv3
Originally committed as revision 3875 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-23 21:54:07 +00:00
Wolfram Gloger
b6c7f870be 10l (a level of indirection too much) patch by (Wolfram Gloger <wmglo dent.med.uni-muenchen de>)
Originally committed as revision 3834 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-13 13:09:35 +00:00
Michael Niedermayer
3eaa8b7e38 timestamp truncation fix?
Originally committed as revision 3832 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-12 19:07:24 +00:00
Michael Niedermayer
2d2651f821 WV1F support
Originally committed as revision 3790 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-01 23:02:09 +00:00
Loren Merritt
f37b9768f6 split ffhuffyuv into 2 codecs:
"huffyuv" is compatible with the official version
"ffvhuff" contains our improvements

Originally committed as revision 3720 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-28 18:29:38 +00:00
Mike Melanson
acfd8f0fdb native QPEG video decoder, courtesy of Konstantin Shishkov
Originally committed as revision 3688 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-17 03:45:53 +00:00
Michael Niedermayer
359fa0febc cbr audio muxing fix
Originally committed as revision 3661 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-06 19:11:34 +00:00
Mike Melanson
ab711b3c8d Miro VideoXL (VIXL) decoder, courtesy of Konstantin Shishkov
Originally committed as revision 3641 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-27 04:30:48 +00:00
Michael Niedermayer
afbb5ce406 dvr-ms video decoding support
Originally committed as revision 3631 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-24 13:07:59 +00:00
Zdenek Kabelac
7fea94ce4a * fixing a few of gcc 'clean-code' warnings
Originally committed as revision 3563 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-06 08:50:46 +00:00
Michael Niedermayer
71c32f19b3 do not call (av_)abort()
Originally committed as revision 3544 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-01 13:16:16 +00:00
Mike Melanson
d0a0bbd22c IBM Ultimotion video decoder, courtesy of Konstantin Shishkov
Originally committed as revision 3468 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-16 03:31:41 +00:00
Roberto Togni
c931e60860 h261
Originally committed as revision 3409 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-08-22 15:35:21 +00:00
Mike Melanson
9d53d58ea7 TechSmith Camtasia (TSCC) video decoder, courtesy of Konstantin Shishkov
Originally committed as revision 3390 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-08-14 15:08:09 +00:00
Michael Niedermayer
791e7b83c3 my experimental wavelet codec
note, this is far from finished, dont expect todays encodings to be decodeable with cvs tomorrow ...

Originally committed as revision 3341 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-25 23:36:44 +00:00
Michael Niedermayer
627c50b7fc raw rgb support
Originally committed as revision 3330 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-21 01:21:06 +00:00
Michael Niedermayer
4904d6c2d3 10l fix by (Bohdan Horst <nexus at irc dot pl>)
Originally committed as revision 3227 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-17 10:46:08 +00:00
Michael Niedermayer
50c3dd32fd pass timestamps correctly for -sync 0
use zero sized frames in avi to handle duplicate frames

Originally committed as revision 3225 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-15 13:49:12 +00:00
Michael Niedermayer
c60d6ad4bc more fourccs
Originally committed as revision 3212 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-10 14:08:57 +00:00
Michael Niedermayer
e928649b0b pass AVPacket into av_write_frame()
fixes the random dts/pts during encoding
asf preroll fix
no more initial zero frames for b frame encoding
mpeg-es dts during demuxing fixed
.ffm timestamp scale fixed, ffm is still broken though

Originally committed as revision 3168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-29 02:06:32 +00:00
Mike Melanson
d91712990c support SVQ1 in AVI files, just for fun
Originally committed as revision 3112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-07 02:57:13 +00:00
Michael Niedermayer
ee77723580 codec tag for FLV
Originally committed as revision 3002 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-11 19:32:24 +00:00
Michael Niedermayer
7585aa5c4e 4xm codec tag
Originally committed as revision 3001 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-11 19:18:53 +00:00
Michael Niedermayer
b4c64c5092 some tag for mpeg2, so looking MPEG2VIDEO up works
Originally committed as revision 2999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-11 14:58:51 +00:00
Roberto Togni
a273bbfb03 MSZH and ZLIB decoder support
Experimental ZLIB encoder (not working yet)

Originally committed as revision 2693 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-12 22:14:45 +00:00
Mike Melanson
b7cbfc2307 DUCK codec
Originally committed as revision 2556 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-03 04:58:48 +00:00
Laurent Aimar
cc15c93127 H264 fourcc patch by (Laurent Aimar <fenrir at via dot ecp dot fr>)
Originally committed as revision 2540 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-29 00:21:33 +00:00
Mike Melanson
764ef40015 disable encoders where appropriate (patch courtesy of BERO
<bero -at- geocities.co.jp>)

Originally committed as revision 2375 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-14 04:15:53 +00:00
Mike Melanson
2fdf638b0c New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
Video-1, Apple RPZA, Cinepak, Westwood IMA ADPCM

Originally committed as revision 2324 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-01 04:39:38 +00:00
Michael Niedermayer
b49d4175c2 10l
Originally committed as revision 2321 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-29 22:40:01 +00:00
Fabrice Bellard
490579042a 64 bit pts for writing - more const usage
Originally committed as revision 2255 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-10 22:37:33 +00:00
Fabrice Bellard
80783dc2c2 CODEC_ID_MP3LAME is obsolete
Originally committed as revision 2232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-08 22:04:29 +00:00
Mike Melanson
9e8cd0db54 hacks to support Xan AVI files
Originally committed as revision 2220 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-08 04:17:40 +00:00
Alex Beregszaszi
3aa180b84e initial nut muxer and demuxer (demuxer is not fail safe)
Originally committed as revision 2211 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-05 18:45:32 +00:00
Michael Niedermayer
77efa159eb case insensitive codec_get_id()
Originally committed as revision 2205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-04 10:26:49 +00:00
Michael Niedermayer
8d876a433c asv2 regression test
Originally committed as revision 2188 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-01 13:05:21 +00:00
Michael Niedermayer
6b17c988e5 ATI VCR2
Originally committed as revision 2080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-24 23:37:40 +00:00
Michael Niedermayer
be3564edad ATI VCR1 decoder
Originally committed as revision 2076 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-24 12:18:46 +00:00
Michael Niedermayer
5b9d235fce 10l
Originally committed as revision 2037 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-12 16:55:15 +00:00
Alex Beregszaszi
ccafe7b122 lossless jpeg support
Originally committed as revision 1981 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-20 18:21:58 +00:00
Michael Niedermayer
7408ad05cc 10l
Originally committed as revision 1940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-09 19:11:50 +00:00
Michael Niedermayer
9ca9fce1dd asv1 regression test
Originally committed as revision 1912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-27 22:43:34 +00:00