virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
7,436 Commits 37 Branches 400 Tags 463 MiB
521fe1d2da
Commit Graph

544 Commits

Author SHA1 Message Date
Michael Niedermayer
2ceff404b5 forgot 
Originally committed as revision 4756 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-19 03:08:08 +00:00
Michael Niedermayer
71160c55e0 fix q=0 bug 
Originally committed as revision 4754 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-18 19:59:33 +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
Måns Rullgård
4733abcbf3 use PRIxN, %zd, %td formats where needed 
Originally committed as revision 4740 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-12 01:56:46 +00:00
Michael Niedermayer
60d76256cb psnr calculation with threads>1 fix 
Originally committed as revision 4725 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-07 18:21:16 +00:00
Michael Niedermayer
a75a3ca429 frame skip fixes 
fix 16pixel error in comparission
 fix vbv messup
 fix unlimited skip intervals, limited by GOP now

Originally committed as revision 4678 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-11-05 00:16:03 +00:00
Måns Rullgård
bf4e3bd2d0 kill a bunch of compiler warnings 
Originally committed as revision 4522 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-08-14 15:42:40 +00:00
Martin Boehme
acb22f9391 Fix for overflow issue in mpegvideo.c patch by (Martin Boehme: boehme, inb uni-luebeck de) 
this integer overflow might lead to the execution of arbitrary code during encoding with threads

Originally committed as revision 4474 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-07-25 23:07:27 +00:00
Michael Niedermayer
8c3eba7c62 skip_idct 
skip_frame
skip_loop_filter

Originally committed as revision 4440 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-07-14 21:39:36 +00:00
Diego Biurrun
bb628dae44 spelling fixes 
patch by Peter Robinson pbrobinson @ at @ gmail . dot . com and myself

Originally committed as revision 4382 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-06-17 15:02:53 +00:00
Michael Niedermayer
ded8477def fix max b frames with b frame strategy 1 
Originally committed as revision 4300 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-21 22:20:26 +00:00
Måns Rullgård
30344a83e0 remove/replace non-ascii characters 
Originally committed as revision 4237 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-13 21:04:16 +00:00
Michael Niedermayer
bf873ee62a b_frame_strategy sanity check 
Originally committed as revision 4222 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-12 01:31:11 +00:00
Michael Niedermayer
9cd8179818 #defines for strict_std_compliance and split between inofficial extensions and non standarized things 
Originally committed as revision 4205 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-08 20:15:42 +00:00
Michael Niedermayer
6b51185c63 overflow fix 
Originally committed as revision 4201 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-08 09:58:41 +00:00
Michael Niedermayer
1192ce3707 complain about mpeg4 limits only if codec_id == MPEG4 
Originally committed as revision 4200 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-08 00:44:06 +00:00
Michael Niedermayer
8b975b7ca5 put most codecs under ifdefs 
Originally committed as revision 4173 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-02 22:14:42 +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
Mike Melanson
160d679c07 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped") 
Originally committed as revision 4153 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-24 17:21:11 +00:00
Kevin Baragona
dfb706da4d Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com) 
Originally committed as revision 4151 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-24 11:13:49 +00:00
Michael Niedermayer
ee572c5482 remove duplicate clip to 8bit function 
Originally committed as revision 4143 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-20 10:05:15 +00:00
Mike Melanson
6f921f3100 remove superfluous CONFIG_ENCODERS (entire function is already wrapped) 
Originally committed as revision 4139 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-19 04:29:11 +00:00
Michael Niedermayer
09c3e44e8a motion estimation bitrate penalty compensation 
Originally committed as revision 4092 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-27 12:19:59 +00:00
Michael Niedermayer
cec1f05fd7 check mb/me_threshold range, fixes assertion failure 
Originally committed as revision 4082 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-26 18:10:44 +00:00
Michael Niedermayer
02dc898338 alignment fix 
Originally committed as revision 4059 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-19 13:10:09 +00:00
Michael Niedermayer
40c5fa2689 AVOption removial patch from (James A. Morrison >ja2morri csclub.uwaterloo ca>) 
with minor changes from me

Originally committed as revision 4019 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-06 23:20:53 +00:00
Loren Merritt
2f944356bf H.264: decode arbitrary frame orders and allow B-frames as references. 
Originally committed as revision 4003 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-04 12:47:38 +00:00
Loren Merritt
e21f398378 vismb: display 4x4 partition boundaries in H.264 
Originally committed as revision 3999 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-03 06:57:17 +00:00
Michael Niedermayer
8dd2a893dd set supported pix_fmts 
Originally committed as revision 3982 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-25 15:06:21 +00:00
Måns Rullgård
88730be651 kill warnings patch by (Måns Rullgård <mru inprovide com>) 
Originally committed as revision 3977 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-24 19:08:50 +00:00
Josh Varner
fe533bb3a7 removing --disable-risky patch by (Josh Varner <jlvarner gmail com>) 
Originally committed as revision 3966 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-21 17:50:48 +00:00
Christophe Massiot
957c743a23 Border processing adaptive quant patch by (Christophe Massiot |cmassiot freebox fr) 
Originally committed as revision 3927 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-02 18:49:04 +00:00
Johan Bilien
ebaa7e0315 rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr) 
Originally committed as revision 3926 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-02 18:14:59 +00:00
Michael Niedermayer
e8ea90123d framerate check 
Originally committed as revision 3869 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-23 14:07:25 +00:00
Michael Niedermayer
dd4f8a04fe jpeg style yuv fixes 
Originally committed as revision 3852 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-20 00:30:20 +00:00
Michael Niedermayer
a9c3ff5b9e assertion about bits statistic and minor bits stat fix 
Originally committed as revision 3835 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-14 23:48:12 +00:00
Michael Niedermayer
30231f8169 10l (dont modify the input picture pts) 
Originally committed as revision 3833 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-13 11:59:19 +00:00
Kurosu
f41c1fac3c av_malloc vs av_mallocz patch by (Kurosu <kurosu inforezo org>) 
Originally committed as revision 3830 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-12 18:25:48 +00:00
Michael Niedermayer
0ecca7a49f various security fixes and precautionary checks 
Originally committed as revision 3822 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-12 00:16:25 +00:00
Michael Niedermayer
eaba7c7fd6 picture heap corruption fix 
Originally committed as revision 3819 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-10 23:41:25 +00:00
Loren Merritt
650cec0c8c vismv for h264 displayed incorrect motion vectors. 
Originally committed as revision 3765 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-20 03:03:37 +00:00
Michael Niedermayer
3c9ec07ef2 quantizer overflow warning + AAN dct fix 
Originally committed as revision 3754 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-14 20:17:23 +00:00
Michael Niedermayer
732ce18eab warn the user if the quantization code could overflow with the selected custom matrix and qp limits 
Originally committed as revision 3747 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-11 18:33:18 +00:00
Michael Niedermayer
0fd6aea1f1 more flexible frame skip decission 
Originally committed as revision 3743 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-08 18:02:56 +00:00
Michael Niedermayer
bbf18b21b7 frame skip support 
Originally committed as revision 3742 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-08 11:46:16 +00:00
Michael Niedermayer
d0271e8a3a rv20 encoding 
Originally committed as revision 3739 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-07 13:14:37 +00:00
Michael Niedermayer
6989963c1f 10l (dont use codec_id for error simulation) 
Originally committed as revision 3718 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-28 14:58:50 +00:00
Burkhard Plaum
073c2593c9 Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>) 
Originally committed as revision 3717 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-27 18:10:06 +00:00
Michael Niedermayer
6db2583c4f check num_entries too to avoid reading over the array end and dont check i>0 it must be >0 there 
Originally committed as revision 3708 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-24 00:15:49 +00:00
Loren Merritt
80516d720a Fixes a segfault when flushing delayed B-frames on the 2nd pass. patch by (Loren Merritt <lorenm.u@washington@edu>) 
Originally committed as revision 3707 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-23 23:58:54 +00:00
Maarten Daniels
ccff9da62a H261 fixing and cleaning: 
-corrected wrong value in mv data
 -set correct mb_type after adjusting index
 -don't use H263 loop filter when the loop filter flag is set but when
  using the H261 encoder
 -use the same unquantizer as H263 (which is optimized btw)
 -removed unused members in H261Context
patch by (Maarten Daniels <maarten.daniels >at< luc >dot< ac >dot< be>)

regression test checksum update by me

Originally committed as revision 3669 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-12 01:21:34 +00:00
Michael Niedermayer
1c3990dbba H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>) 
Originally committed as revision 3643 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-28 10:12:57 +00:00
Michael Niedermayer
035817727f support strictly enforcing gop size 
Originally committed as revision 3594 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-15 02:37:04 +00:00
Michael Niedermayer
9efc77c86f fix forcing of individual frame types 
Originally committed as revision 3593 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-14 12:24:16 +00:00
Michael Niedermayer
ac8b03c0a8 lowres 4mv 
Originally committed as revision 3576 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-09 12:02:19 +00:00
Michael Niedermayer
5f6c92d40c h.261 loop filter fix 
closes bug #1033108

Originally committed as revision 3574 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-08 22:57:39 +00:00
Milan Cutka
125af02243 Quantizer noise shaping crashes on SSE2 machines patch by (Milan Cutka <cutka at szm dot sk>) 
Originally committed as revision 3571 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-08 10:37:45 +00:00
Michael Niedermayer
4f8a831994 set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0) 
Originally committed as revision 3518 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-27 02:39:55 +00:00
Michael Niedermayer
718455951c lowres chroma fix 
Originally committed as revision 3517 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-26 23:01:42 +00:00
Michael Niedermayer
0f74857497 lowres slice fix 
Originally committed as revision 3516 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-26 21:28:31 +00:00
Michael Niedermayer
da9c9637ae low resolution interlaced support 
Originally committed as revision 3512 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-26 11:05:35 +00:00
Michael Niedermayer
178fcca848 1/2 resolution decoding 
Originally committed as revision 3507 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-25 23:18:58 +00:00
Michael Niedermayer
3c00436b3e 100l 
Originally committed as revision 3501 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-24 17:30:04 +00:00
Michael Niedermayer
9ebb8e1124 check if the user specified timestamps are strictly monotone 
timestamp guess code 10l fix

Originally committed as revision 3483 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-20 13:47:47 +00:00
Loren Merritt
1140139fe2 10l (scene change pict_type was wrong after coded_frame fix) patch by (Loren Merritt <lorenm at u dot washington dot edu>) 
Originally committed as revision 3471 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-16 17:36:39 +00:00
Michael Niedermayer
b100eab869 changing size segfault fix 
Originally committed as revision 3463 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-15 00:35:18 +00:00
Michael Niedermayer
d32064c0f7 comment fix 
Originally committed as revision 3462 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-14 18:35:03 +00:00
Michael Niedermayer
2d3601b564 qprd + mpeg2 segfault fix 
Originally committed as revision 3461 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-14 17:17:12 +00:00
Michael Niedermayer
7b37a6e984 10l (wrong coded_picture) 
Originally committed as revision 3441 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-08 10:07:08 +00:00
Michael Niedermayer
1765920791 minor optimization 
Originally committed as revision 3386 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-08-13 14:40:33 +00:00
Michael Niedermayer
1477ec35dd 10l (dont store 2 different things at the same place ...) 
Originally committed as revision 3380 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-08-11 19:32:34 +00:00
Christophe Massiot
f1dc14a9fa miscalculation of header_bits when using the -thread option bugfix, patch by (Christophe Massiot <cmassiot at freebox dot fr>) 
Originally committed as revision 3329 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-07-20 17:13:08 +00:00
Michael Niedermayer
77e6c403e7 10l (fixes delayed frames during encoding) 
Originally committed as revision 3278 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-30 23:12:21 +00:00
Ivan Kalvachev
ffdff4d7e8 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs 
Originally committed as revision 3215 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-11 07:59:12 +00:00
Michael Niedermayer
d4c5d2adf3 nsse weight 
Originally committed as revision 3205 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-07 17:30:02 +00:00
Michael Niedermayer
e6a2ac3474 noise preserving sum of squares comparission function 
Originally committed as revision 3204 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-07 03:23:31 +00:00
Michael Niedermayer
23854cadec sanity checks 
Originally committed as revision 3202 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-06 19:44:05 +00:00
Michael Niedermayer
a1e07d39be qscale + qprd fix 
Originally committed as revision 3192 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-05 18:10:23 +00:00
Michael Niedermayer
0e9d4a67f4 change qscale -> lambda for the motion estimation 
finetune bit/distortion weighting factor used in motion estimation, the old coeffs where finetuned relative to incorrect mv_penalty tables which where then fixed later but the coeffs where not
this _may_ fix the long standing blocking artifacts, but may also introduce mudding artefacts theoretically, so please tell us if u stumble across any so we can either fix them or export this variable so the user can change it

Originally committed as revision 3189 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-03 19:29:47 +00:00
Michael Niedermayer
bb8140f29d h261 dequant fix 
Originally committed as revision 3180 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-31 00:42:55 +00:00
Michael Niedermayer
c6148de232 h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>) 
Originally committed as revision 3176 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-30 20:37:15 +00:00
Michael Niedermayer
5751815562 export low_delay for encoding too 
Originally committed as revision 3170 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-29 15:16:52 +00:00
Chris Flerackers
a7fcb3ea5c rtp callback context patch by ("Chris Flerackers" <cflerackers at androme dot be>) 
Originally committed as revision 3141 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-18 17:23:49 +00:00
Michael Niedermayer
e96682e6f4 some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>) 
Originally committed as revision 3140 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-18 17:09:46 +00:00
Michael Niedermayer
1f202b0d46 moving motion estimation specific variables from MpegEncContext -> MotionEstContext 
Originally committed as revision 3124 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-11 01:38:46 +00:00
Michael Niedermayer
eea8c08fa8 cleanup & memleak fix 
Originally committed as revision 3095 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-30 17:42:58 +00:00
Michael Niedermayer
bf266e195a intra_dc_precission>0 encoding support 
Originally committed as revision 3093 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-30 13:44:29 +00:00
Michael Niedermayer
844ce49d12 10l 
Originally committed as revision 3090 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-30 01:35:45 +00:00
Michael Niedermayer
000a9c02db 10l 
Originally committed as revision 3088 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-29 22:12:29 +00:00
Michael Niedermayer
e4cb187db8 remove duplicated find_frame_end() code 
move codec specific code from parser.c -> <codecname>.c as far as its easily possible

Originally committed as revision 3087 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-29 14:21:33 +00:00
Michael Niedermayer
9964df63ee minor motion estimation cleanup 
4mv motion vector passthrough

Originally committed as revision 3051 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-24 03:36:37 +00:00
Michael Niedermayer
1671083f55 sanity check 
Originally committed as revision 3047 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-23 21:17:31 +00:00
Michael Niedermayer
f4f3223ffd reuse motion vectors/mb types/field select values of the source video, if the SSE for a macroblock which is predicted with these values is below me_threshold 
currently works only with mpeg1/2 source or some luck
may need -sync 0 as otherwise framedrops could lead to extreemly long b frame sequences

Originally committed as revision 3042 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-23 19:06:30 +00:00
Michael Niedermayer
7c4f71c428 exporting field_select/ref_index values 
Originally committed as revision 3035 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-19 03:33:23 +00:00
Michael Niedermayer
3803021453 fix y scale of mv vissualization of interlaced MVs 
Originally committed as revision 3033 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-18 18:30:05 +00:00
Michael Niedermayer
a4d36c1113 passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder 
moving ref_index from Picture to AVFrame

Originally committed as revision 3028 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-17 19:41:49 +00:00
Michael Niedermayer
14e2a9404e flv dropable p frame support 
Originally committed as revision 3027 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-17 13:36:21 +00:00
Michael Niedermayer
137c8468e8 unify table indexing (motion_val,dc_val,ac_val,coded_block changed) 
minor +-1 bugfix

Originally committed as revision 3016 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-16 01:01:45 +00:00
Michael Niedermayer
8100cab9c6 nicer looking arrows for the motion vector vissualization 
Originally committed as revision 2950 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-03 01:55:24 +00:00
Michael Niedermayer
b44bdf7eec interlaced chroma MC divx-bug workaround 
Originally committed as revision 2947 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-02 19:54:33 +00:00