Michael Niedermayer
2fef0bdfc1
try to set next_pts to a reasonable value in case of streamcopy
...
Originally committed as revision 3753 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-14 20:01:49 +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
7ca60994f7
max frames command line options
...
Originally committed as revision 3722 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-30 16:03:29 +00:00
Michael Niedermayer
8a6cb11455
10l (encode bit buffer too small for 1920x1080 raw)
...
Originally committed as revision 3716 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-27 17:46:30 +00:00
François Revol
2450cff2c3
BeOS threading support. changed some "if FOO_THREAD||BAR_THREAD" to a more generic "if HAVE_THREADS"
...
Originally committed as revision 3702 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-21 18:04:56 +00:00
Michael Niedermayer
cbb6e405c0
parts of the dvd patch from ("Chris" <chris <at< garveycocker >dot< com> and Paul Curtis <pfc >at> terrapin <dot< com>)
...
Originally committed as revision 3700 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-21 03:37:33 +00:00
Michael Niedermayer
9286699a67
disable redundant image formats, otherwise we wont get any bugreports about -f image2
...
Originally committed as revision 3683 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-14 22:30:44 +00:00
Michael Niedermayer
5b6d559680
move p*m from image/lavf -> image2/lavc
...
video/audio_codec_id in AVFormatParameters to override/help demuxer
av_guess_codec() to guess the default codecs based upon muxer + filename
Originally committed as revision 3668 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-11 18:09:28 +00:00
Michael Niedermayer
70122f2902
remove weird offsets
...
Originally committed as revision 3660 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-04 19:02:14 +00:00
Michael Niedermayer
b551204a96
stdin detection fix
...
Originally committed as revision 3633 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-24 22:32:40 +00:00
Roman Shaposhnik
2639c651db
* Introducing new UI for grabbing.
...
There's an option -grab <format> that basically acts as -i
but for grabbing. So now it's possible to grab from multiple
sources at once and fully control -r -s and -pix_fmt for
each individual grab.
* removing -dv1394
Please use -grab dv1394 instead.
Originally committed as revision 3613 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-20 04:57:09 +00:00
Michael Niedermayer
92a80570aa
add the long_name to the -formats output patch by (john Galloway <jrg at monsterbot dot com>) and (Måns Rullgård <mru at mru dot ath dot cx>)
...
Originally committed as revision 3611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-19 10:52:59 +00:00
Wolfram Gloger
daed32f7d0
update sync_opts for video frame copy patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
...
Originally committed as revision 3605 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-17 23:57:28 +00:00
Michael Niedermayer
17c88cb0ce
user setable preload and max_mux_delay
...
Originally committed as revision 3602 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-16 21:27:42 +00:00
Michael Niedermayer
b2a2197e71
user setable fourcc
...
Originally committed as revision 3597 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-16 01:51:50 +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
Michel Bardiaux
f255e0abfc
config options log patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
...
Originally committed as revision 3582 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-11 19:50:50 +00:00
Michael Niedermayer
3ba1438dec
use native timebase for seeking
...
direction flag for seeking
Originally committed as revision 3577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-10 22:05:43 +00:00
Michel Bardiaux
791d8d1d67
Doc improvement for -target patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
...
Originally committed as revision 3569 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-07 03:20:27 +00:00
Michael Niedermayer
6c55b27f8f
do not randomize unknown timestamps
...
Originally committed as revision 3568 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-07 01:55:34 +00:00
Michael Niedermayer
2db3c638a7
user selectable packet_size and mux_rate
...
Originally committed as revision 3566 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-06 22:29:30 +00:00
Paul Curtis
78a0efb4fc
AVOutputFormat mpeg2dvd_mux and int is_dvd from the dvd patch by (Paul Curtis <pfc at terrapin dot com>)
...
Originally committed as revision 3557 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-03 18:21:45 +00:00
Michael Niedermayer
f20ad5534a
fix initial vbv buffer underflow
...
Originally committed as revision 3556 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-03 13:21:52 +00:00
Nathan Kurz
c19e76ceb7
ffmpeg not selecting first available stream, patch by (Nathan Kurz <nate at verse dot com>)
...
Originally committed as revision 3538 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-29 15:53:37 +00:00
Michael Niedermayer
78953e626f
avoid using local arrays outside the block where they live ...
...
Originally committed as revision 3536 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-28 21:50:40 +00:00
Michael Niedermayer
58978c070a
less printf spam
...
Originally committed as revision 3533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-28 19:14:47 +00:00
Michael Niedermayer
32019cddb4
fix assert
...
Originally committed as revision 3532 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-28 14:52:24 +00:00
Michael Niedermayer
8cbd529f12
10l (wrong context)
...
Originally committed as revision 3508 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-25 23:54:38 +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
a42c7b07ae
removing useless code
...
Originally committed as revision 3493 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-22 18:50:15 +00:00
Michael Niedermayer
2b18dcd06d
last timestamp and -vsync 0 fix
...
Originally committed as revision 3492 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-22 17:50:53 +00:00
Michael Niedermayer
bd1b79a145
initial timestamp fix
...
Originally committed as revision 3485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-20 15:49:24 +00:00
Michael Niedermayer
bf0669aa87
forgotten parameter
...
Originally committed as revision 3428 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-02 13:28:37 +00:00
Michael Niedermayer
df84ac2e7d
stack overflow
...
Originally committed as revision 3389 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-08-14 14:51:10 +00:00
Michael Niedermayer
baced9f598
user overrideable level & profile
...
Originally committed as revision 3385 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-08-13 13:59:28 +00:00
Michael Niedermayer
9b7bf3c866
spelling fixes, closes bug #1005426
...
Originally committed as revision 3383 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-08-13 00:50:56 +00:00
Michael Niedermayer
65bf3c53a7
typo fix by ("Todd.Kirby" <doubleshot at pacbell dot net>)
...
Originally committed as revision 3344 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-26 16:32:15 +00:00
Michael Niedermayer
8300609b78
multi frame duplication fix
...
Originally committed as revision 3338 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-25 09:30:56 +00:00
Patrice Bensoussan
a9aeda81e7
Fix bug causing conversion to stop when output_packet() fails patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
...
Originally committed as revision 3337 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-25 00:22:20 +00:00
Patrice Bensoussan
0a38bafdcd
Option to copy meta data from specified file patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
...
Originally committed as revision 3331 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-21 01:35:32 +00:00
Michael Niedermayer
eb5ec8fe6c
segfault fix
...
Originally committed as revision 3322 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-16 00:00:52 +00:00
Michael Niedermayer
28f88dc826
in/outfile options
...
Originally committed as revision 3311 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-14 02:39:55 +00:00
Michael Niedermayer
23c9925329
libdts support by (Benjamin Zores <ben at geexbox dot org>)
...
Originally committed as revision 3310 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-14 01:32:14 +00:00
Michael Niedermayer
eb507b21c4
comment is no longer true
...
Originally committed as revision 3309 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-14 00:27:55 +00:00
Michael Niedermayer
1ac3176044
ugly missing lrintf workaround by ("Steven M. Schultz" <sms at 2bsd dot com>)
...
Originally committed as revision 3289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-05 19:19:04 +00:00
Michael Niedermayer
c43042a7d4
100l fix by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
...
Originally committed as revision 3286 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-02 20:20:57 +00:00
Michael Niedermayer
f41dd5aad5
100l(audio sync) fix by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
...
Originally committed as revision 3283 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-02 13:25:04 +00:00
Mike Melanson
da1da89044
use a more portable version macro
...
Originally committed as revision 3281 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-01 03:34:49 +00:00
Michael Niedermayer
ff4905a524
better audio drift compensation
...
Originally committed as revision 3275 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-30 17:53:05 +00:00
Michael Niedermayer
641aa661f6
10l
...
Originally committed as revision 3273 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-30 15:09:21 +00:00
Michael Niedermayer
986ebcdb1b
audio timestamp drift compensation
...
Originally committed as revision 3272 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-30 14:47:29 +00:00
Michael Niedermayer
ff90688844
10l
...
Originally committed as revision 3268 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-30 10:33:37 +00:00
Mike Melanson
13100292d3
add some expanded information when printing the banner, and always print
...
the banner; this will hopefully help in bug reporting
Originally committed as revision 3267 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-30 00:29:52 +00:00
Michael Niedermayer
23ffe323d0
-t + capture bugfix
...
Originally committed as revision 3266 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-29 22:56:54 +00:00
Michael Niedermayer
27537106ac
try to allocate the buffer before usig it :)
...
Originally committed as revision 3245 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-22 21:45:30 +00:00
Michael Niedermayer
6f82497728
flush audio encoder buffers at the end
...
fix vorbis in nut again
Originally committed as revision 3244 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-22 21:14:01 +00:00
Wolfram Gloger
cfcbbe48b6
Correct audio parameters when grabbing and using "-acodec copy" patch by (Wolfram Gloger <wmglo at dent ot med dot uni-muenchen dot de>)
...
Originally committed as revision 3235 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-18 16:32:45 +00:00
Luca Abeni
6e454c38b0
A/V Synch in ffmpeg patch by (Luca Abeni <lucabe72 at email dot it>)
...
Originally committed as revision 3233 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-18 03:03:32 +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
72bd81008e
timestamp discontinuity correction try #1
...
Originally committed as revision 3218 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-12 03:41:36 +00:00
Wolfram Gloger
a6a92a9aa6
user specified start time offset
...
frame dup/drop info
typos
patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
Originally committed as revision 3217 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-11 22:03:16 +00:00
Michael Niedermayer
1a11cbcc49
-cbp
...
change -dc range from 0-3 to 8-11
Originally committed as revision 3193 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-05 21:08:45 +00:00
Michael Niedermayer
f7e1e69e18
-qprd
...
Originally committed as revision 3187 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-02 18:51:43 +00:00
Michael Niedermayer
2a8edc5d92
10l (-top 0)
...
Originally committed as revision 3186 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-02 17:17:44 +00:00
Michael Niedermayer
3c895fc098
correctly interleave packets during encoding
...
dts/pts fixed for streamcopy
dont use coded_frame->key_frame hack in muxers, use AVPacket.flags instead
Originally committed as revision 3171 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-29 18:50:31 +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
Michael Niedermayer
9debb40040
100l
...
Originally committed as revision 3151 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-23 14:35:55 +00:00
Michael Niedermayer
9ee91c2f53
move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
...
Originally committed as revision 3148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-21 20:43:21 +00:00
Michael Niedermayer
c7baf14bd4
muxing overhead statistic fix for stream copying
...
Originally committed as revision 3143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-20 16:05:47 +00:00
Michael Niedermayer
22f7a0601e
automatic framerate selection
...
Originally committed as revision 3132 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-12 16:51:39 +00:00
Michael Niedermayer
fcee016467
automatic pixel format selection
...
Originally committed as revision 3131 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-12 16:00:44 +00:00
Michael Niedermayer
dd17409ca0
next_pts fix by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
...
note, dont take the PSNR/stddev values serious, they are caused by a bug in ffmpeg.c which drops one frame before the last frame during encoding with b frames
Originally committed as revision 3110 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-05 21:23:28 +00:00
Michael Niedermayer
8a0c66a7e3
coder, context, predictor command line options
...
Originally committed as revision 3109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-05 21:19:08 +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
242f5b0a88
ffmpeg -version
...
Originally committed as revision 3091 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-30 12:30:51 +00:00
Wolfram Gloger
4b85a28f27
Fix synthetic next_pts calculation / audio pts patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
...
Originally committed as revision 3079 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-26 23:06:29 +00:00
Michael Niedermayer
4ea4b27469
lmin/lmax
...
Originally committed as revision 3070 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-25 19:43:01 +00:00
Michael Niedermayer
f20f8a8b0b
support reusing mb types and field select values of the source file, but use motion vectors just as additional predictors
...
minor cleanup
segfault fix
Originally committed as revision 3060 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-25 02:09:47 +00:00
Michael Niedermayer
5efe481a15
-qpel option
...
Originally committed as revision 3055 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-24 13:34:32 +00:00
Timofei V. Bondarenko
2f0472ff81
me_range patch by ("Timofei V. Bondarenko" <timm at ipi dot ac dot ru>)
...
Originally committed as revision 3045 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-23 20:39:23 +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
8857a7ef32
10l
...
Originally committed as revision 3034 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-18 21:59:42 +00:00
Michael Niedermayer
e31d863ede
pts fix / b frame segfault fix
...
Originally committed as revision 3030 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-18 13:43:23 +00:00
Michael Niedermayer
2de28abbfd
10l (segfault fix)
...
Originally committed as revision 3029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-18 11:22:35 +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
bf17ff617b
stream copy pts fix
...
Originally committed as revision 3025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-17 03:34:17 +00:00
Michael Niedermayer
37f5cd5a18
10l (stats didnt include av_write_trailer())
...
Originally committed as revision 3015 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-15 16:34:38 +00:00
Michael Niedermayer
1008ceb380
print video/audio/global_header size and muxing overhead
...
Originally committed as revision 3014 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-15 13:57:55 +00:00
Allen Day
d223532c23
printf macro patch by (Allen Day <allenday at ucla dot edu>)
...
Originally committed as revision 2998 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-11 13:54:40 +00:00
Allen Day
d8019eb5d8
verbosity patch by (Allen Day <allenday at ucla dot edu>)
...
Originally committed as revision 2997 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-11 13:50:42 +00:00
Michael Niedermayer
b2e3c52814
require the user to explicitly specifiy --enable-gpl before enabling of gpl parts becomes possible
...
print correct license if --enable-gpl is specified
Originally committed as revision 2985 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-09 14:50:00 +00:00
Todd Kirby
1ff93ffcd4
padding support in ffmpeg patch by (Todd Kirby <doubleshot at pacbell dot net>)
...
Originally committed as revision 2982 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-08 18:54:40 +00:00
Roman Shaposhnik
4568325a18
* making it possible to specify recording date and time in a stream
...
Originally committed as revision 2971 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-06 06:31:12 +00:00
Michael Niedermayer
64c020a8ab
10000l
...
Originally committed as revision 2966 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-05 10:27:26 +00:00
Michael Niedermayer
0a3b044718
pass frame_size for stream copy
...
Originally committed as revision 2943 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-01 19:16:24 +00:00
Wolfram Gloger
6fb316d563
Support raw mpegts streams from dvr patch by (wmglo at dent dot med dot uni-muenchen dot de)
...
Originally committed as revision 2931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-26 17:40:40 +00:00
Michael Niedermayer
d7646d7d93
h263 loop filter option
...
Originally committed as revision 2930 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-26 17:31:00 +00:00
Michael Niedermayer
458eaddad1
slice structured encoding support & interlaced spelling
...
Originally committed as revision 2906 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-18 22:51:42 +00:00
Michael Niedermayer
950b55d3e2
wrong help text
...
Originally committed as revision 2904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-18 21:56:53 +00:00