videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-17 04:11:09 +02:00
Code Releases Activity
17,257 Commits 36 Branches 398 Tags 246 MiB
b250f9c66d
Commit Graph

698 Commits

Author SHA1 Message Date
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
Stefano Sabatini
1c9ff17920 Make the maximum number of simultaneous HTTP connections handled by 
ffserver a configuration parameter. The name of the new parameter
introduced is MaxHTTPConnections.

Originally committed as revision 15182 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 18:16:34 +00:00
Justin Ruggles
e6fa1ca5c3 fix sorting of audio codecs 
Originally committed as revision 15139 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-01 13:32:30 +00:00
Bartlomiej Wolowiec
755ba88640 Remaining parts of Nellymoser encoder 
Originally committed as revision 15138 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-01 11:19:26 +00:00
Justin Ruggles
9a584db43c the FLAC encoder has an integer-only mode available (compression_level <= 2) 
Originally committed as revision 15130 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 20:11:25 +00:00
Justin Ruggles
a692130f88 cosmetics: capitalization 
Originally committed as revision 15129 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 19:59:52 +00:00
Justin Ruggles
575a5bf2d8 Dnet AC-3 encoding is integer-only 
Originally committed as revision 15128 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 19:59:27 +00:00
Justin Ruggles
44723c8459 add E-AC-3 to supported codec list 
Originally committed as revision 15127 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 19:57:45 +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
Carl Eugen Hoyos
bb68b69dfb MXF is a valid output format now. 
Originally committed as revision 14976 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-26 16:09:41 +00:00
Peter Ross
eb6fc557db Include floating point PCM in changelog and documentation. 
Originally committed as revision 14879 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-21 10:54:24 +00:00
Robert Swain
7d8f3de4a8 Last hunk of the AAC decoder code to be OKed and build system and documentation 
alterations as appropriate

Originally committed as revision 14873 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-21 07:21:26 +00:00
Jai Menon
833e90ddf5 Update changelog and general.texi to reflect 
addition of the alac encoder, add Jai Menon
to MAINTAINERS and bump LIBAVCODEC_VERSION_MINOR.

Originally committed as revision 14849 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-19 19:25:00 +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
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
7fc332c7ba Remove reference to the unsupported master format from ffserver.conf. 
Originally committed as revision 14675 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-09 12:52:23 +00:00
Peter Ross
cfc78718f3 Electronic Arts TGV decoder 
Originally committed as revision 14642 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-06 08:33:25 +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
Peter Ross
b98052d505 give additional use case for version bumping; remove no longer true statement about version strings 
Originally committed as revision 14470 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-29 21:45:23 +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
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
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
Peter Ross
6916e38a1c Include 32-bit PCM description 
Originally committed as revision 14411 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-26 07:12:54 +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
Ramiro Polla
28ce183917 Add a checklist about new codecs or formats to the documentation. 
Originally committed as revision 14159 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-11 00:59:27 +00:00
Ramiro Polla
822cc8f71c Update Changelog and documentation for MVI demuxer and decoder. 
Originally committed as revision 14158 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-10 18:01:21 +00:00
Diego Biurrun
5c5a6dfebb Update info for Sonic, add Dirac to supported formats list. 
Originally committed as revision 14157 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-10 16:37:46 +00:00
Diego Biurrun
64c2f20a58 Sort lists ignoring case. 
Originally committed as revision 14156 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-10 16:33:10 +00:00
Diego Biurrun
d698c5d3a7 cosmetics: Fix inconsistent indentation. 
Originally committed as revision 14155 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-10 16:31:11 +00:00
Diego Biurrun
76ec3939e6 Ignore case when sorting. 
Originally committed as revision 14128 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-08 15:05:59 +00:00
Diego Biurrun
16f76f6e66 List QuickTime container as MOV/QuickTime. 
Originally committed as revision 14127 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-08 15:04:41 +00:00
Diego Biurrun
326e025f2d Remove redundant Macromedia Flash entry in supported formats list. 
Originally committed as revision 14126 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-08 15:04:00 +00:00
Diego Biurrun
bac4c85caa format name cosmetics, spelling cosmetics 
Originally committed as revision 14125 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-08 15:01:44 +00:00
Diego Biurrun
16d81b2784 Sort and prettyprint audio codecs table. 
Originally committed as revision 14124 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-08 14:47:22 +00:00
Diego Biurrun
d66d8b836b Sort and prettyprint video codecs table. 
Originally committed as revision 14123 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-08 14:41:12 +00:00
Diego Biurrun
c6b2dc34c5 Sort and prettyprint the file formats table. 
Originally committed as revision 14122 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-08 14:34:15 +00:00
Diego Biurrun
0c18fe372d Remove file extension from some formats, it's never mentioned consistently. 
Originally committed as revision 14121 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-08 14:24:08 +00:00
Diego Biurrun
159f799dc0 liba52 is not always used for AC-3 decoding. 
Originally committed as revision 14120 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-08 14:09:14 +00:00
Diego Biurrun
3d172fb5de Sort image formats table. 
Originally committed as revision 14119 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-08 14:08:45 +00:00
Diego Biurrun
69cec4e32d WMV8 is fully supported now. 
Originally committed as revision 14117 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-08 14:03:28 +00:00
Diego Biurrun
a590faeb57 spelling cosmetics and format name fixes 
Originally committed as revision 14116 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-08 14:03:05 +00:00
Diego Biurrun
38b5b28e62 liba52 is no longer necessary for AC-3 decoding. 
Originally committed as revision 14115 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-08 13:53:28 +00:00
Diego Biurrun
0a91f4eebe spelling cosmetics 
Originally committed as revision 14114 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-08 13:52:48 +00:00
Peter Ross
6ef82274a1 Electronic Arts CMV latent dox entry 
Originally committed as revision 14113 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-08 13:40:29 +00:00
Kostya Shishkov
f67c1f4d26 Cosmetics: align 
Originally committed as revision 14075 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-05 09:11:35 +00:00
Kostya Shishkov
c5e46a0f2d Move MLP/TrueHD from video to audio codecs section. 
Originally committed as revision 14074 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-05 09:11:07 +00:00
Ramiro Polla
b517af05b9 MLP/TrueHD decoder. 
Originally committed as revision 14067 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-04 15:44:13 +00:00
Stefano Sabatini
dde2d1dc36 Remove credit to Philip Gladstone contribution from the ffserver 
documentation. Philip Gladstone aka philipjsg contributed the first
version of the section named Quickstart (now incorporated into the
DESCRIPTION section).

Originally committed as revision 14042 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-30 21:40:28 +00:00
Stefano Sabatini
d6fbdcec05 Update ffserver docs to match r13978, ffserver in debug mode now 
directs logs to stdout.

Originally committed as revision 13982 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-25 22:35:51 +00:00
Stefano Sabatini
fb6b04aae9 Incorporate ffserver documentation Quick Start chapter into the 
man DESCRIPTION section.

Originally committed as revision 13941 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-24 09:07:19 +00:00
Stefano Sabatini
c1bb8f9792 Document ffserver debug mode. 
Originally committed as revision 13896 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 17:26:13 +00:00
Stefano Sabatini
60b51bb262 Document ffserver daemon mode. 
Originally committed as revision 13895 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 16:30:21 +00:00
Stefano Sabatini
dea7da1063 Document ffserver no-launch mode. 
Originally committed as revision 13894 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 16:23:58 +00:00
Stefano Sabatini
d45bad6cef Add a "Status stream" section in ffserver-doc.texi. 
Originally committed as revision 13831 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-19 21:42:09 +00:00
Stefano Sabatini
f26a60a0f0 Add an "How does it work" section in ffserver-doc.texi. 
Originally committed as revision 13808 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-18 21:48:56 +00:00
Stefano Sabatini
bc2869f6dd Fix an example command in ffserver-doc.texi. 
Originally committed as revision 13777 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-16 08:26:38 +00:00
Benjamin Larsson
f059427cf0 Forgotten oma docs stuff 
Originally committed as revision 13766 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-13 14:51:55 +00:00
Ramiro Polla
f010d3774e Add note about not including MinGW's include directory from within MSVC. 
Originally committed as revision 13679 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-06 21:41:09 +00:00
Ramiro Polla
bb00536ea3 output_example.c now uses proper include paths. 
Originally committed as revision 13678 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-06 21:37:07 +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
Dmitry Antipov
1a592ecc47 Add Intel IWMMXT2 link, patch by Dmitry Antipov, dmantipov yandex ru. 
Originally committed as revision 13467 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 13:27:51 +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
Stefano Sabatini
b467be729e small consistency fixes for the ffplay manual 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13441 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 23:01:22 +00:00
Stefano Sabatini
d6880d4d26 small consistency fixes for the ffserver manual 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13440 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 22:59:02 +00:00
Stefano Sabatini
a28b7ed488 Add -formats option to ffplay. 
Patch by Stefano Sabatini stefano sabatini-lala poste it

Originally committed as revision 13246 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 07:15:56 +00:00
Stefano Sabatini
f346033e9d Add -formats option to ffserver. 
Patch by Stefano Sabatini stefano sabatini-lala poste it

Originally committed as revision 13245 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 07:14:28 +00:00
Stefano Sabatini
8fdea2042e Implement ffplay -L. 
Patch by: Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13235 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-22 09:49:18 +00:00
Stefano Sabatini
8117c97e12 Implement ffserver -version. 
Patch by: Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13234 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-22 09:48:34 +00:00
Ben Littler
74a926ff04 update adding codec docs 
Originally committed as revision 13209 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-21 15:51:04 +00:00
Stefano Sabatini
1b068b2984 Let ffplay support "-version". 
Patch by: Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13208 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-21 14:12:45 +00:00
Ramiro Polla
ed729c356c Add note about using latest MSYS make for MinGW. 
Thanks to tripp for the not mingw32 make note...

Originally committed as revision 12905 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-19 12:24:02 +00:00
Ramiro Polla
d6504e427c make wininstaller has been removed in r12416 
Originally committed as revision 12904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-19 12:19:02 +00:00
Sisir Koppaka
2003d3da1a BFI video decoder. 
Patch by Sisir Koppaka sisir koppaka gmail
Original thread: [FFmpeg-devel] BFI video decoder
Date: 04/17/2008 04:25 PM

Originally committed as revision 12890 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-18 08:43:11 +00:00
Michael Niedermayer
57639aa340 unassigned imdct & windowing TODO 
Originally committed as revision 12860 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-16 15:36:50 +00:00
Robert Marston
74118c07c7 documentation update for new Maxis EA XA decoder/demuxer 
patch by Robert Marston, rmarston gmail com

Originally committed as revision 12840 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-15 20:51:23 +00:00
Sisir Koppaka
b64c096be9 BFI demuxer 
Patch by Sisir Koppaka (sisir.koppaka at G.M!A.I!L.com)

Originally committed as revision 12808 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-13 21:06:31 +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
Michael Niedermayer
b885e0dbe6 Add a point to the checklist about checking new demuxers/decoders 
against damaged input.

Originally committed as revision 12669 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-02 18:58:41 +00:00
Jai Menon
d299be08ee Add IFF demuxer and 8SVX audio decoder to changelog and documentation. 
patch by Jai Menon, realityman gmx net

Originally committed as revision 12668 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-02 18:19:43 +00:00
Sascha Sommer
86b3cf7c04 rl2 documentation update 
Originally committed as revision 12546 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-21 14:09:12 +00:00
Ramiro Polla
10cac9f9c2 Add Mimic and MSN TCP Webcam streams to documentation. 
Originally committed as revision 12507 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-19 18:51:20 +00:00
Ivo van Poorten
d1928ac129 add some missing formats: lmlm4, pva, pcx and sun rasterfile. 
Originally committed as revision 12497 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-18 23:50:55 +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
88a7a2dc6c wording improvement by the Wanderer 
Originally committed as revision 12427 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-12 23:54:21 +00:00
Mike Melanson
fecf966f17 Ministry of English Composition edits, courtesy of the Wanderer 
Originally committed as revision 12424 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-12 22:05:47 +00:00
Mike Melanson
bf99f4fccc Ministry of English Composition edits 
Originally committed as revision 12420 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-11 05:04:16 +00:00
Michael Niedermayer
95049fecb2 Clarify the intended meaning of wont_fix. 
Originally committed as revision 12396 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-09 14:46:08 +00:00
Kostya Shishkov
9dc92a38a0 IMA ADPCM encoder - QT variant 
Originally committed as revision 12348 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-06 07:30:41 +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
Mike Melanson
6609f9e2ee minor English corrections 
Originally committed as revision 12171 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-21 18:46:49 +00:00
Michael Niedermayer
8144dff032 typos 
Originally committed as revision 12170 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-21 18:42:33 +00:00
Michael Niedermayer
7b8c3aedac "General Tips" section 
Originally committed as revision 12168 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-21 13:02:31 +00:00
Mike Melanson
ead6ebdd44 Use a consistent capitalization for 'Snow' as discussed on the list 
Originally committed as revision 11880 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-08 19:17:46 +00:00
Michael Niedermayer
beaa4a9133 Correct fatal ambiguity. 
Originally committed as revision 11862 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-04 13:12:15 +00:00