virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
27,410 Commits 37 Branches 400 Tags 464 MiB
f9d6b13a23
Commit Graph

146 Commits

Author SHA1 Message Date
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
Roman Shaposhnik
631670888d * introducing new public interface in imgconvert.c 
+ avcodec_get_pix_fmt
         converts textual representation of pixel format into
	 the actual id. Complements avcodec_get_pix_fmt_name.
       + avpicture_layout
         serializes given picture into a flat array.
	 Complements avpicture_fill.

   * adding a new option -pix_fmt to the ffmpeg, in order to control
     pixel format for the codecs that do support it, like rawvideo,
     for example.

   * reducing complexity of the rawvideo codec by splitting it in two
     and making it more reliable via hooking up to the avpicture_layout.
     Plus adding new FourCC as described here: http://www.fourcc.org

   * A tiny fix for avienc.c that makes avih and video strf consistent
     regarding codec FourCC.

Originally committed as revision 1842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-05-07 19:01:45 +00:00
Mike Melanson
d86053a416 first pass at a new VP3 video decoder 
Originally committed as revision 1831 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-05-05 02:54:15 +00:00
Roman Shaposhnik
8c0ff5d5c2 * Making AVI encoding predictable (all JUNK chunks are filled with 0) 
* Updating regression refs
 * Making server-regression.sh work on Solaris

Originally committed as revision 1818 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-24 03:59:33 +00:00
Zdenek Kabelac
546031ee86 * keeping compiler happy and quiet 
Originally committed as revision 1817 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-23 18:38:34 +00:00
Zdenek Kabelac
5d23497493 * more strict types 
Originally committed as revision 1815 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-23 08:56:14 +00:00
Roman Shaposhnik
e738cee9c4 Complete support for OpenDML AVIs and AVIs > 2Gb. 
Originally committed as revision 1814 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-23 02:04:40 +00:00
Michael Niedermayer
22cf045590 we really shouldnt use M$* as default codec -> use MPEG4 as default 
Originally committed as revision 1785 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-17 19:56:33 +00:00
Mike Melanson
deabd4fdde native Indeo3 decoder implementation 
Originally committed as revision 1777 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-15 10:12:38 +00:00
Philip Gladstone
d86852d11c Clear out an unused field in the created AVI file. This helps make 
the MD5 checksums *much* more predictable!!

Originally committed as revision 1762 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-12 03:04:08 +00:00
Roman Shaposhnik
ce9fce63c5 AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>) 
Originally committed as revision 1741 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-04-08 09:51:15 +00:00
Sebastien Bechet
e8b478c131 I420 patch by (Sebastien Bechet <s dot bechet at av7 dot net>) 
Originally committed as revision 1710 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-26 23:25:18 +00:00
Michael Niedermayer
a05c8d7177 merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later) 
Originally committed as revision 1690 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-18 17:22:23 +00:00
Fred Rothganger
e8750b0076 rawvideo patch by (Fred Rothganger <rothgang at uiuc dot edu>) 
Originally committed as revision 1687 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-16 21:03:20 +00:00
Michael Niedermayer
14bea432f1 per context frame_rate_base, this should finally fix frame_rate related av sync issues 
Originally committed as revision 1666 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-12 15:16:19 +00:00
Michael Niedermayer
e23d5712ea wmv2 & huffyuv regression test 
Originally committed as revision 1650 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-08 11:50:26 +00:00
Michael Niedermayer
952c69c479 huffyuv encoding fixed 
Originally committed as revision 1647 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-08 11:21:33 +00:00
Michael Niedermayer
b559b29b1f read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed) 
fixed framerate encoding & decoding hopefully, this should fix av sync on long AVIs

Originally committed as revision 1646 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-08 10:57:44 +00:00
Zdenek Kabelac
0c1a9edad4 * UINTX -> uintx_t INTX -> intx_t 
Originally committed as revision 1578 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-02-11 16:35:48 +00:00
Mike Melanson
1e711bd603 hook this up to the CYUV decoder 
Originally committed as revision 1564 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-02-09 17:03:32 +00:00
Andriy Rysin
850742d785 audio only avi patch by (Andriy Rysin <arysin at bcsii dot net>) 
Originally committed as revision 1513 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-01-27 02:18:41 +00:00
Michael Niedermayer
f560dd8279 huffyuv 4cc & -strict 
(huffyuv still doesnt work with ffmpeg (it does work with mencoder though) someone should fix the avi de(muxer))

Originally committed as revision 1363 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-12-27 11:42:52 +00:00
Michael Niedermayer
492cd3a920 AVVideoFrame -> AVFrame 
Originally committed as revision 1327 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-12-09 12:03:43 +00:00
Michael Niedermayer
1e491e29c2 cleanup 
adding AVVideoFrame
 moving quality, pict_type, key_frame, qscale_table, ... to AVVideoFrame
 removing obsolete variables in AVCodecContext
 skiping of MBs in b frames
 correctly initalizing AVCodecContext
 picture buffer cleanup

Originally committed as revision 1302 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-12-04 10:04:03 +00:00
Fabrice Bellard
abac617591 renamed libav to libavformat 
Originally committed as revision 1276 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-11-25 19:07:40 +00:00