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

316 Commits

Author SHA1 Message Date
Stefano Sabatini
66e9aa7463 Make less verbose a sentence in the preset system documentation.
Originally committed as revision 15570 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-05 22:41:43 +00:00
Stefano Sabatini
4a60e574bb Document the preset files system.
Originally committed as revision 15563 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-05 09:45:54 +00:00
Diego Biurrun
1a27fb001a FFmpeg is not made for bats: Fix 22050Hz vs. 22050kHz typo.
Originally committed as revision 15535 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-03 19:14:48 +00:00
Diego Biurrun
910f02a054 spelling cosmetics
Originally committed as revision 15518 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-02 16:28:58 +00:00
Stefano Sabatini
0769649711 Add to the ffmpeg manual an example showing how to add streams to the
output.

Originally committed as revision 15030 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 17:44:42 +00:00
Erwan Ducroquet
850a8d42ab Add examples in documentation showing how to avoid to decode audio and
output video in pass 1 for 2-pass encoding.
Patch by Erwan Ducroquet erwan _dot_ ducroquet _at_ gmail _dot_ com

Originally committed as revision 14736 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 19:49:37 +00:00
Stefano Sabatini
8d36d36e74 Add to the ffmpeg docs an usage example showing how to extract images
from a video.

Originally committed as revision 14711 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 10:07:28 +00:00
Stefano Sabatini
bb89b0bc9d Improve docs for the ffmpeg -map option.
Originally committed as revision 14530 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-04 07:02:48 +00:00
tripp
9c17037200 Fix and clarify invalid examples for framerate override in the documentation.
patch by tripp, eliared yahoo com

Originally committed as revision 14431 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-27 19:38:25 +00:00
Jason Garrett-Glaser
e3576e2513 Improve documentation about -bt option
Originally committed as revision 14397 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-25 21:04:06 +00:00
tripp
3a9b190c54 Enhance qblur and qcomp documentation.
Patch by tripp eliared yahoo com

Originally committed as revision 14333 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-22 07:20:17 +00:00
tripp
5ad2b4c621 Add complete listing of bitstream filters and 2 examples to the documentation.
patch by tripp, eliared yahoo com

Originally committed as revision 14329 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-21 21:06:49 +00:00
tripp
bbc35f515f Clarify -minrate/-maxrate description in the documentation.
patch by tripp, eliared yahoo com

Originally committed as revision 14320 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-21 05:25:59 +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
Stefano Sabatini
a19caa0f3e Mark option arguments as variables using @var{}.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 12771 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-08 16:39:30 +00:00
Stefano Sabatini
53d1bdbaed Clarify the documentation for 'ffmpeg -v'.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 12216 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 16:01:53 +00:00
Ramiro Polla
1156c6b05f Rename the format name audio_device (used in both oss and audio_beos) to oss and audio_beos.
-f oss and -f audio_beos should be used instead.

Originally committed as revision 10429 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-07 13:49:44 +00:00
Diego Biurrun
d0e1cd3d9e Split FFmpeg documentation into general documentation and the documentation
of the ffmpeg command line program.

Originally committed as revision 10255 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-28 06:22:57 +00:00
Godwin Stewart
250c531710 update -t option documentation
Patch by Godwin Stewart

Originally committed as revision 10146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-20 06:50:09 +00:00
Diego Biurrun
e1669c5ebe Attempt to better explain how to split patches into individual
self-contained pieces.

Originally committed as revision 10108 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-13 22:15:48 +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
Michael Niedermayer
f754bfb962 get rid of nonsense "tolerance" and mention VBV
Originally committed as revision 9957 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-06 00:05:09 +00:00
Diego Biurrun
1502409e4d Add note about vertical alignment to patch guidelines.
Originally committed as revision 9695 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-16 09:00:50 +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
Diego Biurrun
0f69ca7f14 Clarify license requirements for contributions.
Originally committed as revision 9626 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-13 14:33:20 +00:00
Stefano Sabatini
c0de00dac5 me option implemented as an AVOption
patch by Stefano Sabatini: [stefano sabatini-lala poste it]
original thread:
[FFmpeg-devel] [PATCH] ffmpeg.c -me option implemented as an AVOption
date: 07/05/2007 03:12 PM

Originally committed as revision 9501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-06 11:47:02 +00:00
Ramiro Polla
c74a8fe62a Add note about dlfcn-win32 for MinGW vhooks
Originally committed as revision 9470 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-03 17:59:28 +00:00
Alexis Ballier
d3b7406c6f QT RLE encoder
patch by Alexis Ballier: [alexis ballier gmail com]
original thread: [FFmpeg-devel] [Patch] QT RLE encoder, bis
date: 06/24/2007 03:56 PM

Originally committed as revision 9452 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-02 07:06:28 +00:00
Vitor Sessak
7cbf432db1 Mention unneeded casts and parentheses
patch by Vitor: [vitor1001 gmail com]

Originally committed as revision 9445 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-27 10:37:37 +00:00
Vitor Sessak
03e3e76544 RoQ video encoder
patch by Vitor: \vitor1001 gmail com/
original thread: [FFmpeg-devel] RoQ video encoder (take 3)
date: 06/08/2007 10:34 PM

Originally committed as revision 9420 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-25 12:09:23 +00:00
Víctor Paesa
43399718fb Add a few missing Advanced Options.
Originally committed as revision 9385 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-21 20:21:36 +00:00
Diego Biurrun
755bfeabcc misc spelling fixes
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-12 09:29:25 +00:00
Michael Niedermayer
1aa80145c5 dont attach huge samplesto mails
Originally committed as revision 9284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-11 23:37:15 +00:00
Diego Biurrun
7b900f2d0b '-acodec mp3' --> '-acodec libmp3lame'
Originally committed as revision 9248 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-07 16:49:08 +00:00
Diego Biurrun
1cc60c47c5 Consistent naming and lib prefixes for x264, xvid and mp3lame within the code.
Originally committed as revision 9230 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-06 08:51:41 +00:00
Stefano Sabatini
c3b95b1d3d Add support for listing the supported pixel formats using the option
-pix_fmt list
patch by Stefano Sabatini stefano sabatini minus lala chez poste it
original thread: [FFmpeg-devel] [PATCH] List supported pixel formats
date: 05/25/2007 05:46 PM

Originally committed as revision 9162 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-30 14:20:55 +00:00
Diego Biurrun
197b07f360 --enable-amr-* --> -- enable-libamr-*
Originally committed as revision 9134 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-27 13:33:40 +00:00
Ivo van Poorten
3592648940 -sws_flags command line option to set swscaler flags
Originally committed as revision 9109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-23 18:35:45 +00:00
Vitor Sessak
13dec85765 RoQ muxer, patch by Vitor, vitor1001 gmail com
reference thread:
Subject: [FFmpeg-devel] [PATCH] RoQ muxer
Date: Wed, 09 May 2007 19:44:21 +0200

Originally committed as revision 8959 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-09 23:07:40 +00:00
Ivo van Poorten
12b6d7c007 add Renderware TXD format
Originally committed as revision 8936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-08 11:01:14 +00:00
Ivo van Poorten
d58bbf8154 add V.Flash PTX image format
Originally committed as revision 8935 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-08 11:00:33 +00:00
Diego Biurrun
b09432ad47 RoQ audio encoder
Originally committed as revision 8932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-07 23:33:33 +00:00
Michael Niedermayer
d9a3c855fb better wording for the alphabetical lists
Originally committed as revision 8918 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-06 12:23:44 +00:00
Diego Biurrun
6e4bc6ee19 Add a note about maintaining alphabetical order to patch submission checklist.
Originally committed as revision 8912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-06 10:48:41 +00:00
Diego Biurrun
e300ab4ed2 Add a note about tabs + trailing whitespace to the patch submission checklist.
Originally committed as revision 8889 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-04 19:39:51 +00:00
Diego Biurrun
b0fee7c53c Group benchmark items in the patch submission checklist together.
Originally committed as revision 8887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-04 19:37:01 +00:00
Diego Biurrun
bca098f54d Policy addition: New files should have proper license headers.
Originally committed as revision 8825 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 09:47:56 +00:00
Diego Biurrun
73508bc6d3 Remove hackish support for the non-free fixed-point AMR-NB reference code.
Originally committed as revision 8813 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-25 19:12:04 +00:00
Stefano Sabatini
b60d13799d add a vstats_file command line option
patch by Stefano Sabatini stefano sabatini-lala poste it

Originally committed as revision 8810 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-25 13:55:11 +00:00
Benoit Fouet
4bd0c2b1d5 Revert my two previous deliveries (back to r8806) to aply the good patch for vstats
Originally committed as revision 8809 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-25 13:48:36 +00:00
Stefano Sabatini
f801d8aa86 add a vstats_file command line option
patch by Stefano Sabatini stefano sabatini-lala poste it

Originally committed as revision 8807 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-25 09:32:45 +00:00
Michael Niedermayer
2f954ef238 patch submissions should contain a suggested commit log message
Originally committed as revision 8806 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-25 09:27:22 +00:00
Benoit Fouet
9e0ab666b6 updates the x11grab doc example, adding -s cif, as it is mandatory
Originally committed as revision 8804 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-25 08:50:02 +00:00
Diego Biurrun
6baa294326 typo
Originally committed as revision 8801 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-24 23:20:13 +00:00
Benoit Fouet
7d88b5ca02 more format abbreviations
Originally committed as revision 8798 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-24 11:45:13 +00:00
Diego Biurrun
bbe94afb7a Add a note about license headers to the patch submission checklist.
Originally committed as revision 8793 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-23 17:20:27 +00:00
Diego Biurrun
4a7a090834 spelling/wording/punctuation
Originally committed as revision 8768 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-21 11:35:28 +00:00
Benjamin Larsson
10e26bc782 Atrac3 decoder.
Originally committed as revision 8747 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-17 20:53:39 +00:00
Reimar Döffinger
442d1598a3 Fix the most obvious typos in the development policy doc section
Originally committed as revision 8746 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-17 14:06:08 +00:00
Michael Niedermayer
dd597cd7b0 patch submission checklist
Originally committed as revision 8745 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-17 13:07:31 +00:00
Benoit Fouet
b092d03395 add a commit-rule precision when applying patches discussed on the mailing list
Originally committed as revision 8744 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-17 08:37:39 +00:00
Diego Biurrun
4f99f93268 Mention configure parameters for enabling AMR.
Originally committed as revision 8743 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-15 19:45:48 +00:00
Michael Niedermayer
a15bcf7087 one patch one mail
Originally committed as revision 8728 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-13 23:36:58 +00:00
Diego Biurrun
7bb932062e Add a note about how to enable external libraries.
Originally committed as revision 8721 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-12 11:15:23 +00:00
Diego Biurrun
ef4e31d491 typo
Originally committed as revision 8719 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-12 11:07:10 +00:00
Diego Biurrun
6056c939fc Update AMR instructions for last round of changes.
Originally committed as revision 8718 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-12 11:05:38 +00:00
Anssi Hannula
8e952e4d23 CRYO APC demuxer
patch by Anssi Hannula, anssi.hannula gmail com

Originally committed as revision 8656 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 21:34:18 +00:00
Diego Biurrun
8845202e8a Add THP video and audio decoders.
Originally committed as revision 8650 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 20:55:16 +00:00
Nicholas Tung
1e6c67599e Bethsoft VID demuxer and video decoder
patch by Nicholas Tung, ntung ntung com

Originally committed as revision 8649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 20:51:58 +00:00
Marco Gerards
d1e0d21f94 THP PCM decoder, used on the Nintendo GameCube.
patch by Marco Gerards, mgerards xs4all nl

Originally committed as revision 8646 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 16:03:23 +00:00
Anssi Hannula
9a0ddd09e7 Interplay C93 demuxer and video decoder
patch by Anssi Hannula, anssi.hannula gmail com

Originally committed as revision 8643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 14:25:25 +00:00
Justin Ruggles
bfd9a00fff Update doc to show FLAC encoding
Originally committed as revision 8628 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-04 21:00:18 +00:00
Michael Niedermayer
716222db17 tiff encoder by (Bartlomiej Wolowiec b.wolowiec students mimuw edu pl)
Originally committed as revision 8608 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-03 13:43:57 +00:00
Diego Biurrun
efb0c399ca support for the THP game format by Marco Gerards, mgerards xs4all nl
Originally committed as revision 8587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-01 14:28:48 +00:00
Baptiste Coudurier
52b6bad219 dnxhd decoder
Originally committed as revision 8445 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-18 23:25:00 +00:00
Michael Niedermayer
8b5f8e18eb remove secure password delivery requirement after complaint by the SVN admin
Originally committed as revision 8416 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-15 19:23:32 +00:00
Diego Biurrun
ce10ff8e3d misc wording/spelling fixes
Originally committed as revision 8415 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-15 18:23:54 +00:00
Michael Niedermayer
a7a113157a gpg and passwords rule
Originally committed as revision 8414 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-15 12:54:48 +00:00
Michael Niedermayer
0541f2c4d5 add rule to keep disscussion on the public mailinglist (stolen from mplayers policy)
(like always 1 complain from a ffmpeg-developer and ill reverse and we can disscuss it)

Originally committed as revision 8413 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-15 12:52:33 +00:00
Michael Niedermayer
981990db4e patches should be split into incremental changes if possible
add patch split reasoning
suggest asking on ffmpeg-dev if theres doubt about spliting
(and like always if any developer disagrees say so and ill revert this and we can disscuss it on ffmpeg-dev)

Originally committed as revision 8412 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-15 12:38:45 +00:00
Michael Niedermayer
65d0bea8f5 add a entry to the policy about fixing warnings (i think this is common sense but if anydeveloper disagrees, just say so
and ill revert it and we can disscuss it on ffmpeg-dev)

Originally committed as revision 8410 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-15 12:18:47 +00:00
Michael Niedermayer
f5f11d7101 Patch review process
Originally committed as revision 8409 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-15 11:59:50 +00:00
Kostya Shishkov
33a0dd378a DXA demuxer and decoder
Originally committed as revision 8405 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-14 14:49:49 +00:00
Víctor Paesa
6b74787b89 --enable-mingw32 --> --target-os=mingw32
patch by Victor Paesa, wzrlpy arsystel com

Originally committed as revision 8308 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-09 19:41:04 +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
Kostya Shishkov
01ca9ac334 DCA decoder
Originally committed as revision 8141 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-27 06:30:40 +00:00
Alex Beregszaszi
f2d64c1968 warn that under windows, bash <3.1 may fail on configure
Originally committed as revision 8076 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-22 14:45:53 +00:00
Ramiro Polla
cc58300e30 implement new grabbing interface, as described here:
ttp://thread.gmane.org/gmane.comp.video.ffmpeg.devel/42920
patch by Ramiro Polla % ramiro A lisha P ufsc P br %
Original thread:
Date: Jan 31, 2007 8:56 PM
Subject: [Ffmpeg-devel] [PATCH] New grabbing interface

Originally committed as revision 7983 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-14 17:01:32 +00:00
Ivan Kalvachev
67053c3093 -s option have different defaults for ffmpeg and ffserver cases.
Originally committed as revision 7947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-12 14:07:04 +00:00
Diego Biurrun
74882049e1 WMA encoding
Originally committed as revision 7858 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-06 21:27:18 +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
Benjamin Larsson
1541946878 Flash screen video encoding support.
Originally committed as revision 7703 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-25 08:26:18 +00:00
Diego Biurrun
150d27725b Theora encoding via libtheora.
courtesy of Paul Richards, paul.richards gmail com

Originally committed as revision 7698 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-25 00:16:28 +00:00
Diego Biurrun
d3af6f3f81 Remove outdated Linux section.
Originally committed as revision 7542 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 15:59:10 +00:00
Kostya Shishkov
185c7b6b26 Musepack SV7 decoding support
Originally committed as revision 7375 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-24 04:51:43 +00:00
Aurelien Jacobs
9110a0e32d Add support for VP60 and VP61.
Originally committed as revision 7329 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-17 22:00:12 +00:00
Panagiotis Issaris
0cd4faf977 Allow provision of displaynumber, screennumber, x-offset and y-offset parameters
to the x11grab device.

Originally committed as revision 7320 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-15 13:19:03 +00:00
Diego Biurrun
913e4081a3 grammar/wording
Originally committed as revision 7315 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 10:42:15 +00:00
Baptiste Coudurier
76d2efda6d documentation for X11 grabbing
Originally committed as revision 7314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 10:27:50 +00:00
Kostya Shishkov
f48d6e1b44 ZMBV encoder
Originally committed as revision 7242 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-07 04:17:01 +00:00