virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Code Issues Releases Activity
51,905 Commits 37 Branches 400 Tags 462 MiB
5ec016ad0b
Commit Graph

175 Commits

Author SHA1 Message Date
Tilman Brock
b08f59dca4 Fix spelling error. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-14 12:20:14 -05:00
Stefano Sabatini
c906d974b7 Fix script command in a FAQ entry 
In the FAQ section "How do I encode single pictures into movies?", use
-s for generating symbolic links with the ln command.

The script was generating hard links, which is not likely what it was
supposed to do.

Fix issue 2488.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e063f5886b)
 2011-02-13 00:54:06 +01:00
Stefano Sabatini
e063f5886b Fix script command in a FAQ entry 
In the FAQ section "How do I encode single pictures into movies?", use
-s for generating symbolic links with the ln command.

The script was generating hard links, which is not likely what it was
supposed to do.

Fix issue 2488.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-12 13:17:09 +00:00
Janne Grunau
5231d6277f doc: modify style for texi2html 1.78+ 
The generated HTML files are similar to the ones generated with
texi2html 1.56k used on the website.

Tested with texi2html 1.78 and 5.0. 1.78 is the minimal recommended
version.

The removed @sp from the titlepage section were ignored until
texi2html 5.0. If not removed the pages generated by 5.0 will have ugly
empty space around the title.
(cherry picked from commit a8f0814a74)
 2011-01-30 03:41:47 +01:00
Janne Grunau
a8f0814a74 doc: modify style for texi2html 1.78+ 
The generated HTML files are similar to the ones generated with
texi2html 1.56k used on the website.

Tested with texi2html 1.78 and 5.0. 1.78 is the minimal recommended
version.

The removed @sp from the titlepage section were ignored until
texi2html 5.0. If not removed the pages generated by 5.0 will have ugly
empty space around the title.
 2011-01-29 16:57:29 +01:00
Stefano Sabatini
4c74d1660c Fix typo, -flags 4mv => -flags mv4. 
Originally committed as revision 25326 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-03 17:15:18 +00:00
Diego Biurrun
12002cae59 Remove outdated entries about bt8x8 capture on Linux 2.4 kernels. 
Originally committed as revision 24324 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-19 09:13:56 +00:00
Diego Biurrun
008a44ef8b Mark URL as such with texinfo markup. 
Originally committed as revision 24323 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-19 08:56:55 +00:00
Diego Biurrun
2c880fe101 Clarify bug reporting policy with regard to releases. 
Originally committed as revision 24322 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-19 08:41:47 +00:00
Diego Biurrun
e7f6c252a2 Mark file references as such with texinfo markup. 
Originally committed as revision 24321 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-19 08:34:38 +00:00
Diego Biurrun
675e737917 Remove duplicate RTP depacketization entry. 
Two questions below there is the same Q+A, slightly rephrased.

Originally committed as revision 24320 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-19 07:52:12 +00:00
Diego Biurrun
387fe82c95 Fix URL for ffv1, msmpeg4, asv1, 4xm docs. 
Originally committed as revision 24304 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-18 14:01:33 +00:00
Ramiro Polla
95b98f82b2 faq: remove note that says avisynth "has just been added". it has been there 
for almost 4 years.

Originally committed as revision 24162 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-10 15:25:42 +00:00
Stefano Sabatini
9c16add67b Replace not anymore valid syntax "-title X" with "-metadata title=X". 
Originally committed as revision 22062 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-25 19:38:54 +00:00
John Van Sickle
49f6402236 Improve section 3.2 of the faq by providing more useful examples and a 
simple batch script to rename images to a numerical sequence.

Patch by John Van Sickle printf("%s.%s@%s.com", john, vansickle, gmail).

Originally committed as revision 21330 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-19 22:05:02 +00:00
Stefano Sabatini
54c5848dbd Remove extra empty line. 
Originally committed as revision 21120 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-10 10:40:45 +00:00
John Van Sickle
7659712749 Fix entry on concatenating multiple yuv4mpegpipe streams. 
patch by John Van Sickle, john.vansickle gmail com

Originally committed as revision 21033 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-06 13:49:31 +00:00
Daniel Verkamp
21600a7774 AC-3 decoder is no longer GPL; update FAQ 
Originally committed as revision 20776 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-08 21:18:40 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +00:00
Diego Biurrun
0fa5f24c3b Change mplayerhq.hu references to ffmpeg.org where appropriate. 
Originally committed as revision 16310 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-25 15:49:50 +00:00
Diego Biurrun
c8b4365258 Remove entry about unsupported QCELP codec, it is now supported. 
Originally committed as revision 15988 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-03 13:45:41 +00:00
Stefano Sabatini
cd0e37d3b1 Replaces not the anymore valid -flags +trell option with -trellis 2. 
Originally committed as revision 15954 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-29 13:58:41 +00:00
Víctor Paesa
d9fe7eb385 Fix spelling 
Originally committed as revision 15666 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-22 18:07:35 +00:00
Víctor Paesa
242a2b7eca Fix issue 68: 
Warn that the forum look is no excuse from following the FFmpeg netiquette.

Originally committed as revision 15639 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-18 22:03:21 +00:00
Ramiro Polla
ab5ce4aeae Update link to FFmpeg Windows Help website. 
Originally committed as revision 15312 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-13 18:50:53 +00:00
Daniel Serpell
084cadabbc Add an example of higher resolution video encoding for the PSP to the FAQ. 
patch by Daniel Serpell, dserpell gmail com

Originally committed as revision 14760 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-14 15:23:07 +00:00
Daniel Serpell
b96e074dc7 Fix the PSP examples in the FAQ to use libx264 as codec instead of h264. 
patch by Daniel Serpell, dserpell gmail com

Originally committed as revision 14759 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-14 15:16:17 +00:00
Diego Biurrun
5b43368de9 Add note about gcc bugs that gcc devs refuse to fix. 
Originally committed as revision 14464 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-29 07:55:51 +00:00
Diego Biurrun
f278709c4f typo fix 
Originally committed as revision 14426 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-27 12:36:58 +00:00
Diego Biurrun
831ec93567 Run documentation through ispell, plus some minor fixes. 
Originally committed as revision 13670 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-06 07:51:36 +00:00
Diego Biurrun
a28d9122d2 Add a note about everybody's favorite recurring gcc bug: 
error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'

Originally committed as revision 13496 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-28 16:12:40 +00:00
Diego Biurrun
842eabc5f9 cosmetics: XviD is now called Xvid. 
Originally committed as revision 13465 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 12:32:59 +00:00
Diego Biurrun
2cab640129 typo fixes 
Originally committed as revision 12428 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-12 23:58:46 +00:00
Diego Biurrun
4f1ab3ceee Clarify some FAQ entries. 
Originally committed as revision 11615 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-26 12:23:24 +00:00
Diego Biurrun
d485fed47b Split general problems section into general questions and usage. 
Originally committed as revision 11614 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-26 12:18:28 +00:00
Diego Biurrun
cbf7878e97 Update AC-3 FAQ entry. 
Originally committed as revision 11613 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-26 12:04:56 +00:00
Ramiro Polla
19671d3faf Express opinion in a less aggressive manner. 
Originally committed as revision 10995 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-10 13:23:22 +00:00
Diego Biurrun
a9d5a4485a Clarify Visual Studio FAQ. 
Originally committed as revision 10970 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-09 14:05:43 +00:00
Ramiro Polla
46a845d06e The Windows Help Forum is not ffmpeg-user for Windows 
Originally committed as revision 10918 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-04 01:42:18 +00:00
Ramiro Polla
c198955252 Updated and rewritten Windows-related documentation. 
Originally committed as revision 10849 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-24 03:26:10 +00:00
Ramiro Polla
939bac287e Grammar. 
Originally committed as revision 10809 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-19 04:32:56 +00:00
Ramiro Polla
e75f899784 Add entry about pr not being present in standard MSYS install. 
Originally committed as revision 10769 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-17 17:45:34 +00:00
Diego Biurrun
2956957151 misc wording/grammar/spelling improvements 
Originally committed as revision 10488 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-13 13:45:49 +00:00
Diego Biurrun
36cb992b54 link fixes 
Originally committed as revision 10480 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-12 10:04:44 +00:00
Michael Niedermayer
70fd3975f9 r_frame_rate 
Originally committed as revision 10476 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-11 10:25:34 +00:00
Diego Biurrun
fa78d895cb spelling/grammar 
Originally committed as revision 9966 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-06 21:19:11 +00:00
Víctor Paesa
d65fb393c9 Revert r9952, as per discussion at 
http://lists.mplayerhq.hu/pipermail/ffmpeg-cvslog/2007-August/008834.html

Originally committed as revision 9961 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-06 18:47:18 +00:00
Michael Niedermayer
3b36389af0 vbv related questions 
Originally committed as revision 9958 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-06 00:19:17 +00:00
Michael Niedermayer
5abee3186c thread hijacking 
Originally committed as revision 9952 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-05 20:44:37 +00:00
Michael Niedermayer
86852499bf ffmpeg forum 
Originally committed as revision 9951 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-05 20:37:57 +00:00
Panagiotis Issaris
4cb3aa09fa Add a section about C++ and extern "C" in the FAQ. 
Originally committed as revision 9811 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-27 13:40:02 +00:00
Luca Barbato
33ed2d843e Editorial cleanup, thanks Diego =) 
Originally committed as revision 9723 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-17 14:59:29 +00:00
Luca Barbato
241fb0c4ff RTP clarifications 
Originally committed as revision 9722 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-17 14:15:39 +00:00
Michael Niedermayer
208e63b479 mention rfc 4629 for rtp-h263(+) 
Originally committed as revision 9715 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-17 12:07:10 +00:00
Diego Biurrun
78a3c678f6 spelling/grammar/wording 
Originally committed as revision 9694 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-16 08:54:59 +00:00
Michael Niedermayer
8749180c3b rtp-h263 FAQ 
Originally committed as revision 9683 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-15 12:17:05 +00:00
Víctor Paesa
5965e1a92c Remove space before question marks. 
Originally committed as revision 9378 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-21 05:14:00 +00:00
avcoder
095247b1c1 Change names of codecs provided by external libraries in examples to account 
for the recent renamings of those codecs.
patch by QuickTime, ffmpeg gmail com

Originally committed as revision 9247 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-07 16:43:34 +00:00
Víctor Paesa
5449190f53 Wording improvements for the previous commit. 
Originally committed as revision 9214 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-04 21:09:38 +00:00
Víctor Paesa
f7994861f3 Add FAQ entry for video joining. 
Originally committed as revision 9176 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-02 21:50:45 +00:00
Víctor Paesa
1fee8b3a8c A bit more clear FAQ 1.2 
Patch by Víctor Paesa, wzrlpy arsystel com

Originally committed as revision 9167 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-01 12:03:33 +00:00
Diego Biurrun
7c1ebf179b typo/grammar 
Originally committed as revision 8623 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-04 11:41:13 +00:00
Michael Niedermayer
5d171758c0 update links to old probably obsolete bttv patches 
Originally committed as revision 8459 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-20 21:17:21 +00:00
Michael Niedermayer
afe28f7ce9 link to ffv1, msmpeg4, asv1, 4xm docs 
Originally committed as revision 8458 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-20 21:12:06 +00:00
Michael Niedermayer
04704a7881 libav* headers for pascal 
Originally committed as revision 8457 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-20 21:09:02 +00:00
Diego Biurrun
626fe95573 markup/wording/spelling/formatting improvements for the last commit 
Originally committed as revision 8312 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-10 13:12:24 +00:00
Michael Niedermayer
92574878de @section My bugreport/mail to ffmpeg-dev/user has not received any replies 
Originally committed as revision 8311 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-10 12:37:37 +00:00
Panagiotis Issaris
5438308f3b Update the documentation to be consistent with the new unit for the "ab" 
parameter.

Originally committed as revision 8288 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-07 18:17:16 +00:00
Diego Biurrun
5c159f4061 wording/spelling 
Originally committed as revision 8183 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-02 02:40:45 +00:00
Michael Niedermayer
b72ad0427e decoding rtp 
Originally committed as revision 8170 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-01 14:49:30 +00:00
Benoit Fouet
123bff4bf1 Clarify FAQ, section "ffmpeg does not work". 
Patch by Benoit Fouet, benoit fouet % purplelabs com.

Originally committed as revision 8048 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-21 12:03:59 +00:00
Panagiotis Issaris
ab9c40872e The --enable-a52 option was renamed to --enable-liba52, fix the FAQ regarding 
this change.

Originally committed as revision 8036 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-20 09:59:31 +00:00
Dujardin Bernard
3f6bafc15c FAQ clarification concerning the configuration of FFmpeg for usage with liba52. 
Patch by Bernard Dujardin, dujardin iut % numericable fr.

Originally committed as revision 8035 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-20 09:26:01 +00:00
Diego Biurrun
bc15573283 link fix by Dujardin Bernard, dujardin.iut numericable fr 
Originally committed as revision 8028 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-19 12:14:28 +00:00
Diego Biurrun
e2ef53fc4f Link to the FFmpeg Windows Help website. 
Originally committed as revision 7828 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-05 16:45:36 +00:00
Diego Biurrun
2f0b8fbb64 Put Visual C++ question in a better location. 
Originally committed as revision 7827 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-05 16:38:47 +00:00
Diego Biurrun
e867d9b9c0 Update gcc sections. 
Originally committed as revision 7712 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-25 17:34:08 +00:00
Diego Biurrun
16ab894ecb spelling, formatting 
Originally committed as revision 7530 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-15 05:46:42 +00:00
Michael Niedermayer
c62997a587 some quick encoding tips 
feel free to extend, change, fix spelling and grammer and the formatting ...

Originally committed as revision 7400 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-02 01:19:58 +00:00
Diego Biurrun
eb10acec36 Kb --> kb 
Originally committed as revision 7142 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-20 21:48:08 +00:00
Víctor Paesa
c9068f1b96 Current FFmpeg expects bits/s instead of kilobits/s in the -b option. 
patch by Víctor Paesa, wzrlpy arsystel com

Originally committed as revision 7136 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-20 19:05:18 +00:00
Baptiste Coudurier
3c88ea2476 update docs to reflect AVImageFormat removing 
Originally committed as revision 6899 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-05 13:31:57 +00:00
Ramiro Polla
e976645087 MSys bash 2.04 is broken. 
patch by Ramiro Polla, angustia (at) arrozcru no-ip org

Originally committed as revision 6554 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-04 16:05:00 +00:00
Benjamin Larsson
7a9d265b14 Added qcelp faq. 
Originally committed as revision 6289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-18 20:19:11 +00:00
Diego Biurrun
99f6278e31 wording/spelling 
Originally committed as revision 6283 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-17 07:34:54 +00:00
Víctor Paesa
2c29781dc8 Document how to read DirectShow files, 
Patch by Victor Paesa % wzrlpy A arsystel P com %
Original thread:
Date: Sep 15, 2006 5:12 PM
Subject: [Ffmpeg-devel] [PATCH] Add to FAQ how to read DirectShow files

Originally committed as revision 6280 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-16 12:40:18 +00:00
Michel Bardiaux
a9d21e7830 Update the FAQ with the current status of image formats. 
patch by Michel Bardiaux, mbardiaux at mediaxim dot be

Originally committed as revision 6075 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-24 14:03:08 +00:00
Víctor Paesa
ad21ad451c Explain usage of image formats other than GIF. 
patch by Victor Paesa, wzrlpy *at* arsystel com

Originally committed as revision 5824 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-25 11:42:13 +00:00
Diego Biurrun
1c1b5a4094 CVS --> Subversion 
Originally committed as revision 5458 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-09 09:55:04 +00:00
Michael Niedermayer
f7709b1a07 working H.264 + AAC in mp4 encoding example for the psp 
Originally committed as revision 5412 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-05-27 09:44:33 +00:00
Diego Biurrun
18e7d87c71 typo/grammar fixes 
Originally committed as revision 5409 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-05-19 08:46:47 +00:00
Michael Niedermayer
b4aead58cb ipod & psp encoding guide 
Originally committed as revision 5407 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-05-19 08:09:21 +00:00
Diego Biurrun
fcdff8996f typo fixes 
Originally committed as revision 5396 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-05-18 08:46:47 +00:00
Michael Niedermayer
f994f61e6d URLProtocol faq 
Originally committed as revision 5393 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-05-18 08:01:47 +00:00
Diego Biurrun
788223b155 Remove outdated FAQ entry about A/V sync issues when grabbing. 
Originally committed as revision 5061 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-24 16:07:21 +00:00
Diego Biurrun
70b0bb8772 link fixes 
Originally committed as revision 5050 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-22 10:52:00 +00:00
Diego Biurrun
7a77156975 Point at new bug report page. 
Originally committed as revision 4846 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-13 23:52:35 +00:00
Diego Biurrun
f007d35865 Add entry about release frequency. 
Originally committed as revision 4800 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-02 10:24:06 +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
Diego Biurrun
5062c60c18 Elaborate on the Visual C-- situation. 
Originally committed as revision 4716 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-02 15:25:10 +00:00