1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Commit Graph

298 Commits

Author SHA1 Message Date
Mike Melanson
b76c707acd adapt to use interim palette control API; do away with multi-chunk data
transfer to decoder

Originally committed as revision 2274 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-14 18:56:45 +00:00
François Revol
a018d318e7 64 bit pts for writing - more const usage (don't forget me !)
Originally committed as revision 2269 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-13 09:20:12 +00:00
Mike Melanson
ba118447d5 deploy palette control API
Originally committed as revision 2266 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-12 03:48:14 +00:00
Fabrice Bellard
7b7d86f120 simplified version handling
Originally committed as revision 2264 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-11 22:51:05 +00:00
Mike Melanson
7e5ef401b7 forgot to apply the palette component lookup table
Originally committed as revision 2259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-11 05:39:51 +00:00
Fabrice Bellard
fa0f62c37d removed invalid sequence end code
Originally committed as revision 2256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-10 22:44:30 +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
Michael Niedermayer
8c653280bd get_bi(), be/le fix
Originally committed as revision 2254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-10 13:00:24 +00:00
Michael Niedermayer
2187d9482e theres no SVQ1 encoder -> it cant be default
Originally committed as revision 2252 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-10 10:46:50 +00:00
Michael Niedermayer
6e6d6dc0a5 mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
Originally committed as revision 2249 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-09 23:03:04 +00:00
Michael Niedermayer
9d90c37f39 memleak fix by (Michel Bardiaux <mbardiaux at peaktime dot be>)
Originally committed as revision 2242 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-09 19:32:52 +00:00
Michael Niedermayer
72a476c1e1 kernel header bug workaround by (Ronald Bultje <rbultje at ronald dot bitfreak dot net>)
Originally committed as revision 2241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-09 19:14:05 +00:00
Glenn Maynard
cddf3f452a Debug/optimization patch by (Glenn Maynard <g_sf at zewt dot org>)
Originally committed as revision 2240 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-09 19:03:14 +00:00
Fabrice Bellard
6a58e1510d ID3 parsing and generation in MP3 format
Originally committed as revision 2237 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-08 22:34:28 +00:00
Fabrice Bellard
e224e36030 removed localtime_r.h
Originally committed as revision 2236 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-08 22:32:30 +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
Fabrice Bellard
66a15ea2d2 removed os_support.h
Originally committed as revision 2230 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-08 21:59:53 +00:00
Fabrice Bellard
f71869a4db simpler strptime - added os_support.[ch] - moved localtime_r to os_support.c
Originally committed as revision 2228 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-08 21:20:55 +00:00
Fabrice Bellard
4358d5def3 removed ctype.h header
Originally committed as revision 2225 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-08 20:04:44 +00:00
Fabrice Bellard
a182f5da93 fixed endianness dependancies (untested)
Originally committed as revision 2224 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-08 20:00:13 +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
Mike Melanson
048446bfeb support for Duck DK3 and DK4 ADPCM
Originally committed as revision 2219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-08 04:15:27 +00:00
Mike Melanson
493645ebd2 demuxer for custom Wing Commander III movie (.mve) files
Originally committed as revision 2218 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-08 04:14:34 +00:00
Michael Niedermayer
0a5f92a120 memory leak fix by (Tom Dexter <devel at www dot digitalaudiorock dot com>)
Originally committed as revision 2216 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-07 09:26:39 +00:00
Alex Beregszaszi
ed0bb7bee6 move packetheader after startcodes
Originally committed as revision 2215 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-07 00:37:46 +00:00
Alex Beregszaszi
99b17f25b1 some fixes
Originally committed as revision 2214 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-06 23:17:17 +00:00
Michael Niedermayer
203504d910 padding fix
Originally committed as revision 2213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-06 16:29:05 +00:00
Michael Niedermayer
3ac8749b90 big/little endian fix
storing 64bit stuff in int fix
put_v() fix
startcodes
nut_probe()

Originally committed as revision 2212 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-06 14:03:35 +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
Alex Beregszaszi
8026c3b54c bump version numbers to 0.4.8
Originally committed as revision 2210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-05 14:41:53 +00:00
Michael Niedermayer
ea739de1b9 rewrite
Originally committed as revision 2208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-05 07:11:41 +00:00
Michael Niedermayer
94dcfb14e7 fixing copyright header (the code is from strptime.c so the copyright header should be from there too instead of strptime.h)
Originally committed as revision 2207 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-04 20:15:32 +00:00
Michael Niedermayer
076342fa5c Compile fix when no CONFIG_ENCODERS by (Glenn Maynard <g_sf at zewt dot org>)
Originally committed as revision 2206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-04 10:30:52 +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
Glenn Maynard
5e4639e200 localtime_r patch by (Glenn Maynard <g_sf at zewt dot org>)
Originally committed as revision 2204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-04 09:52:39 +00:00
Michael Niedermayer
a17236c53c MingW patches by (Glenn Maynard <g_sf at zewt dot org>)
Originally committed as revision 2203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-04 08:21:27 +00:00
Mike Melanson
3ef8be2bfc initial commit for Id RoQ and Interplay MVE multimedia subsystems
Originally committed as revision 2195 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-02 04:32:02 +00:00
Michael Niedermayer
149f7c029c fix MPEG-TS missdetected as MPEG-PS
Originally committed as revision 2194 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-01 18:30:02 +00:00
Mike Melanson
3f16d933a9 first pass at PSX STR demuxer; does not yet interact correctly with MDEC
video decoder

Originally committed as revision 2190 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-01 15:55:38 +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
Charles Yates
d9a916e221 stdin patch by (Charles Yates <charles dot yates at pandora dot be>)
* removes use of read_key and getchar when input is received on stdin
(this was corrupting the packet reading)
* terminates av_encode when a termination signal is received (use of
ctrl-c issued a term_exit and subsequent uses of q failed)
* specific correction to yuv4mpeg pipe reading - the defined header was
too short to allow for extended yuv4mpeg flags [as used by smil2yuv and
y4mscaler and accepted by mjpeg tools]

Originally committed as revision 2183 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-29 20:51:10 +00:00
Michael Niedermayer
572f992eff libavformat/avio.h compilation problem in VisualC++ by (lethean at realtime dot ssu dot ac dot kr)
Originally committed as revision 2182 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-29 20:33:57 +00:00
Roman Shaposhnik
904736b519 1000l in abbrv. table
Originally committed as revision 2179 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-29 17:27:48 +00:00
Roman Shaposhnik
ba2a8cb40b * making resolution abbreviations right
* introducing sntsc/spal for square pixel ntsc/pal

Originally committed as revision 2177 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-29 06:58:55 +00:00
Roman Shaposhnik
118e91f3d8 * Phase 1 for DV encoding support. Muxing/demuxing of DV streams is now
possible. For example you can do:

          ffmpeg -i i.dv -i audio_track.mp3 -map 0.0 -map 1.0 \
	         -vcodec copy -acodec pcm_s16le out.dv

   * Preparations for getting rid of DVAUDIO codec, DV stream really
     contains PCM audio, so there's no codec needed if we have a
     decent demuxer.

   * Providing entry points for dv1394 write support.

Originally committed as revision 2174 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-28 19:53:47 +00:00
Mike Melanson
1a31840cea naughty, forbidden variable declarations
Originally committed as revision 2171 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-27 01:26:14 +00:00
Michael Niedermayer
1cb5f7fd41 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
Originally committed as revision 2168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-26 20:23:13 +00:00
Fabrice Bellard
44664b0915 accepts pgmyuv extension
Originally committed as revision 2152 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-24 21:21:10 +00:00
Fabrice Bellard
22b37f5d32 suppressed frame number modulus hack - added loop_input hack which I find easier to understand
Originally committed as revision 2151 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-24 21:20:44 +00:00
Fabrice Bellard
00b4fdb758 win32 compile fix
Originally committed as revision 2139 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-24 13:59:05 +00:00
Roman Shaposhnik
c92454179d all human-readable output should go into stderr for now. We really
need a generic logging facility in ffmpeg, but this will suffice for now.

Originally committed as revision 2131 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-21 21:04:19 +00:00
Michael Niedermayer
bd5a60201e use codec_tag for encoding too
Originally committed as revision 2125 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-18 09:20:02 +00:00
Roman Shaposhnik
36b58e850d * fixing a regression in mpeg encoder (not setting pix_fmt),
this is hardly the right way to do things, but it'll suffice for now.
   * patch from Gildas Bazin
                gbazin at altern dot org
   * fix for a 10l in configure
   * gcc 2.95.3 and Solaris build in general are not ready
     for -Werror in libavformat/Makefile

Originally committed as revision 2123 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-12 18:20:29 +00:00
Fabrice Bellard
c95108037f support for older real audio files (<= version 3)
Originally committed as revision 2119 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-11 16:16:49 +00:00
Fabrice Bellard
48091512c9 no default bit rate if decoding
Originally committed as revision 2117 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-08 18:13:43 +00:00
Fabrice Bellard
12f996edfa initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
Originally committed as revision 2115 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-08 18:02:23 +00:00
Fabrice Bellard
25c4950e9b update duration and start_time
Originally committed as revision 2113 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-08 17:58:38 +00:00
Fabrice Bellard
32f38cb4cc exports mpegps_demux
Originally committed as revision 2112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-08 17:54:05 +00:00
Fabrice Bellard
ca1538f8d9 update duration and start_time
Originally committed as revision 2111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-08 17:53:30 +00:00
Fabrice Bellard
247eadca9d update duration and start_time - add av_new_stream() usage
Originally committed as revision 2110 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-08 17:52:53 +00:00
Fabrice Bellard
fa26a29d65 add av_new_stream() usage
Originally committed as revision 2109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-08 17:52:30 +00:00
Fabrice Bellard
ee40480319 added stream start time and duration API - AV_NOPTS_VALUE is no longer zero
Originally committed as revision 2108 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-08 17:49:27 +00:00
Roman Shaposhnik
1fbe1a61b1 patch for DV capturing by Dan Dennedy <dan at dennedy dot org>
Originally committed as revision 2105 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-06 05:40:38 +00:00
D Richard Felker III
2864dfd579 yuv4mpeg pipe reader for libavformat patch by (D Richard Felker III <dalias at aerifal dot cx>)
Originally committed as revision 2102 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-05 09:32:31 +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
François Revol
438fcb754f OSX and BeOS networking fix (socklen_t)
Originally committed as revision 2077 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-24 13:30:27 +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
Fabrice Bellard
09787fb8af support aborting in TCP
Originally committed as revision 2061 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-17 10:28:27 +00:00
Fabrice Bellard
b7b8fc3406 suppressed RTSP abort hack - added PLAY/PAUSE
Originally committed as revision 2060 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-17 10:27:47 +00:00
Fabrice Bellard
590403c702 removed warnings
Originally committed as revision 2059 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-17 10:26:02 +00:00
Fabrice Bellard
019ac05ace added primitive aborting system
Originally committed as revision 2058 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-17 10:25:36 +00:00
Fabrice Bellard
d5809b0aa2 warnings are errors
Originally committed as revision 2057 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-17 10:24:28 +00:00
Fabrice Bellard
afdd82bbf0 fix fmt == NULL case
Originally committed as revision 2050 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-16 07:50:17 +00:00
Måns Rullgård
8683e4a0c0 Write correct MPEG2-PS streams patch by (mru at users dot sourceforge dot net (Måns Rullgård))
Originally committed as revision 2048 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-15 22:15:37 +00:00
Fabrice Bellard
e5526b2c39 fixed NTP generation for mpeg
Originally committed as revision 2046 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-15 19:41:40 +00:00
Fabrice Bellard
b689213642 fixed RTP/TCP client support
Originally committed as revision 2045 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-15 16:57:35 +00:00
François Revol
aa35ccb8e1 BeOS fix: NOT every ld likes undefined syms, include C++ objs, and link to libs needed for audio in.
Originally committed as revision 2044 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-15 13:35:20 +00:00
Fabrice Bellard
fc48fe84a9 cosmetic change in resync code - added PAT scanning code if no SDT is found (in the futur it would be interesting to give an API to change channel - also useful for DV input number or TV grab tunning
Originally committed as revision 2043 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-15 13:21:39 +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
Roman Shaposhnik
445f1b83ad * First round of AV sync fixes.
* -r now does the right thing.
   * frame rate and frame sizes now share same abbv. table and you
     can do -r ntsc as well as -s ntsc

Originally committed as revision 2035 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-12 07:37:05 +00:00
Tim Allen
6bc114b2fb Shared library for libavformat support patch by (Tim Allen <tim at proximity dot com dot au>)
Originally committed as revision 2033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-11 21:33:27 +00:00
Michael Niedermayer
14b3225377 Building ffmpeg with gcc-2.95.3 encountered a problem due to C99 initialization fix by ("Steven M. Schultz" <sms at 2BSD dot COM>)
Originally committed as revision 2032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-10 23:18:09 +00:00
Isaac Richards
ec23a47286 - Looks a tiny bit harder in mpegps_probe() for a valid start code. This is
needed to detect some files produced by pvr-250/350 capture cards.
- Adds AC3 audio support to the mpegts demuxer, and makes it a little more
tolerant of bad files.
patch by (Isaac Richards <ijr at po dot cwru dot edu>)

Originally committed as revision 2028 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-10 09:04:04 +00:00
Garrick Meeker
d4f5d74a54 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
Originally committed as revision 2024 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-09 23:10:59 +00:00
Michael Niedermayer
342474abd9 av_free_packet SEGV fix by (Arthur van Hoff (javanator))
Originally committed as revision 2013 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-04 23:48:20 +00:00
Michael Niedermayer
e71ea8b251 mpeg1 bad frame_rate_base fix by (Arthur van Hoff (javanator))
Originally committed as revision 2012 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-04 23:08:16 +00:00
Michael Niedermayer
cc74aafbc6 undefined local_port fix by (Giancarlo Formicuccia <ilsensine at inwind dot it>)
Originally committed as revision 2007 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-04 09:14:14 +00:00
Michael Niedermayer
ce34182dd7 try to filter _all_ PATs if no SDT could be found patch by (<gbazin at altern dot org>)
+ mpegtsenc.c compile fix by me

Originally committed as revision 1995 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-28 23:44:09 +00:00
Alex Beregszaszi
e3ee328330 tv standard selection support for dv1394 and grab (v4l)
Originally committed as revision 1987 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-25 10:21:45 +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
Alex Beregszaszi
611d192ce0 warning fixes
Originally committed as revision 1980 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-20 17:55:24 +00:00
Alex Beregszaszi
cad6f6cdee 1000l
Originally committed as revision 1979 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-20 15:51:24 +00:00
Alex Beregszaszi
377ea75708 pal vs ntsc fix by stoyan k <stoyan@i-space.org>
Originally committed as revision 1978 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-20 15:30:14 +00:00
Johannes Carlsson
2f4db4d5e5 amr typefix patch by (Johannes Carlsson <joca at rixmail dot se>)
Originally committed as revision 1972 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-18 22:24:51 +00:00
François Revol
fb059921da cleanup; BSoundRecorder moved to Experimental namespace
Originally committed as revision 1960 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-15 17:06:28 +00:00
Fabrice Bellard
5dbafeb7ba mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
Originally committed as revision 1956 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-13 14:28:45 +00:00
Fabrice Bellard
39f472c3b6 dynamic array functions
Originally committed as revision 1955 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-13 14:22:23 +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
Fabrice Bellard
2af7e61032 use custom packet allocation only for DV
Originally committed as revision 1937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-07 18:36:27 +00:00
Zdenek Kabelac
067cbf313f * amr format - by Johannes Carlsson
Originally committed as revision 1934 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-06 11:47:49 +00:00