virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
23,458 Commits 37 Branches 400 Tags 460 MiB
f75ab7a645
Commit Graph

913 Commits

Author SHA1 Message Date
Olivier Guilyardi
80ff8a16f5 Implement JACK input device. 
Patch by Olivier Guilyardi list samalyse com.
See the thread: "[FFmpeg-devel] [PATCH] libavdevice: JACK demuxer".

Originally committed as revision 18322 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-02 23:53:47 +00:00
Stefano Sabatini
dd3bbb4903 Update after the last API change. 
Originally committed as revision 18318 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-02 20:24:15 +00:00
Gwenole Beauchesne
41913a35b0 Add 16cif video frame size abbreviation. i.e. -s alias for 1408x1152. 
Originally committed as revision 18301 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-01 08:55:31 +00:00
Dylan Yudaken
3ba153f8da Replace MPEG group reference DCT implementation by newly rewritten version. 
patch by Dylan Yudaken, dyudaken gmail com

Originally committed as revision 18274 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-31 15:50:11 +00:00
Michael Niedermayer
52760ed76e The definition of rate and distortion is not conditional of lambda being 
fixed (at least the current text sounded odd to me).

Originally committed as revision 18244 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-30 10:39:20 +00:00
Diego Biurrun
d95a0c67ae Move output_example.c --> libavformat/output-example.c. 
The libavformat directory is a better place for a libavformat API example.

Originally committed as revision 18199 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-27 00:01:06 +00:00
Diego Biurrun
c8f742ca49 The Mersenne Twister PRNG was removed, mention replacement. 
Originally committed as revision 18183 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-25 10:18:47 +00:00
Diego Biurrun
889cdae8ef cosmetics: Reformat paragraphs and other cosmetic changes. 
Originally committed as revision 18182 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-25 10:12:31 +00:00
Daniel Verkamp
effcedf738 PCX encoder that handles 1-, 8-, and 24-bpp pixfmts. 
Patch by Daniel Verkamp, daniel drv nu

Originally committed as revision 18077 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-20 17:23:45 +00:00
Ramiro Polla
23d9cc4563 Support raw TrueHD files 
Originally committed as revision 18049 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-19 21:46:56 +00:00
Ramiro Polla
9ba4821d93 Split TrueHD decoder from MLP 
Originally committed as revision 18045 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-19 21:23:39 +00:00
Diego Biurrun
23869b4af4 Fix copy and paste typo in input/output devices section. 
Originally committed as revision 18039 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-19 01:04:23 +00:00
Diego Biurrun
fa3f2a3513 Add list of supported input/output devices. 
Originally committed as revision 18029 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-18 07:55:34 +00:00
Diego Biurrun
000bbebb66 Adjust @columnfractions settings to reflect the number of columns in the table. 
Originally committed as revision 18028 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-18 07:49:51 +00:00
Stefano Sabatini
c73d39965e Add an example showing how to create a video from many images. 
Originally committed as revision 17955 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-14 10:18:18 +00:00
Reimar Döffinger
3898eed890 Reorder arguments for av_fifo_generic_read to be more logical and 
consistent with av_fifo_generic_write.

Originally committed as revision 17914 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-09 17:47:47 +00:00
Justin Ruggles
ade29f9983 move NTT VQF demuxer to keep formats list alphabetized. 
Originally committed as revision 17882 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-08 18:33:24 +00:00
Vitor Sessak
d2f532c8a0 Be more verbose in describing VQF demuxer 
Originally committed as revision 17879 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-08 16:08:18 +00:00
Reimar Döffinger
06d19718c4 Add a part explaining that API should be considered unstable after major 
version changes and list dates of last major version increase.

Originally committed as revision 17878 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-08 15:17:37 +00:00
Reimar Döffinger
22d4f236bd Preliminary summary of AVFifoBuffer changes 
Originally committed as revision 17877 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-08 15:09:11 +00:00
Vitor Sessak
616e899c43 VQF demuxer 
Originally committed as revision 17866 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-07 22:42:09 +00:00
Mike Melanson
45e5f85777 excellent first pass at a description; now it's time for the Ministry of 
English Composition to tear it apart and rebuild it, stronger than before

Originally committed as revision 17801 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-04 05:24:59 +00:00
Michael Niedermayer
c36264a353 A quick description of Rate distortion theory. 
Originally committed as revision 17774 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-03 16:09:19 +00:00
Michael Niedermayer
dc7d978a05 Quick description of the Viterbi algorithm so I do not have to repeat it 
over and over again on the ML.

Originally committed as revision 17772 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-03 15:35:20 +00:00
Diego Biurrun
fdf119062e Remove deprecated vhook subsystem. 
Originally committed as revision 17769 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-03 14:09:10 +00:00
Panagiotis Issaris
429d6b2180 Cosmetics: Typo 
Originally committed as revision 17760 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-03 13:25:53 +00:00
Panagiotis Issaris
9549cdcbaa Cosmetics: Typo 
Originally committed as revision 17757 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-03 12:58:49 +00:00
Justin Ruggles
c76d1bb29f AC-3 encoding is integer-only 
Originally committed as revision 17723 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-02 06:31:28 +00:00
Diego Biurrun
ddea12a6b5 Revert previous removal of PAM, PBM, PGM, PGMYUV and PPM from the list of 
supported image formats. Apparently decoding these formats is supported.

Originally committed as revision 17722 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-02 06:13:54 +00:00
Diego Biurrun
12dd57fd29 cosmetics: Reformat long_names so that "DPCM" comes first. 
Originally committed as revision 17721 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-02 06:01:32 +00:00
Diego Biurrun
fd75cedd15 cosmetics: Reformat long_names so that "ADPCM" comes first. 
Originally committed as revision 17720 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-02 05:55:03 +00:00
Diego Biurrun
421ae271da Decoding of PAM, PBM, PGM, PGMYUV and PPM image formats is not supported. 
Originally committed as revision 17715 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-02 05:08:57 +00:00
Diego Biurrun
641992de59 Another round of missing codecs and name updates to match the codec long_name. 
Originally committed as revision 17712 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-02 03:52:40 +00:00
Justin Ruggles
a1c5b6ece7 Add some more missing codecs and update names to match the codec long_name. 
Originally committed as revision 17711 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-02 03:41:58 +00:00
Diego Biurrun
dd2d651d82 Add some more missing codecs and update names to match the codec long_name. 
Originally committed as revision 17710 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-02 03:30:53 +00:00
Diego Biurrun
4d973c6859 Merge MP2, MP3 and MPEG audio demuxer entries. 
Originally committed as revision 17709 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-02 02:58:22 +00:00
Justin Ruggles
68dddf53ff Add some missing codecs and update names to match the codec long_name 
or vice-versa.

Originally committed as revision 17706 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-02 02:25:31 +00:00
Diego Biurrun
9510f59a0f Add some missing codecs and update names to match the codec long_name. 
Originally committed as revision 17705 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-02 01:55:21 +00:00
Justin Ruggles
eacf8613b3 add some missing codecs and update some names to match AVCodec.long_name 
Originally committed as revision 17704 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-02 01:40:21 +00:00
Diego Biurrun
270fc177cf Integer-only decoding of AC-3 is not supported. 
Originally committed as revision 17703 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-02 00:55:43 +00:00
Diego Biurrun
21d4af5d4d Targa encoding is supported. 
Originally committed as revision 17702 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-02 00:34:34 +00:00
Daniel Verkamp
f2937cc627 Add missing image formats, patch by Daniel Verkamp, daniel drv nu. 
Originally committed as revision 17701 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-02 00:29:24 +00:00
Daniel Verkamp
314511ab4d Split PGM and PPM in image formats section. 
patch by Daniel Verkamp, daniel drv nu

Originally committed as revision 17700 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-02 00:27:51 +00:00
Daniel Verkamp
9db80acbcd cosmetics: Break image format lines before comments. 
patch by Daniel Verkamp, daniel drv nu

Originally committed as revision 17699 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-02 00:24:10 +00:00
Aurelien Jacobs
38ce707e02 add an API changelog with a first entry for the new metadata API 
Originally committed as revision 17697 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-01 18:20:26 +00:00
Stefano Sabatini
4b03756748 Document ffplay -ast, -vst, and -sst options. 
Originally committed as revision 17694 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-01 17:13:33 +00:00
Robert Swain
66d8229072 http://bytesex.org/xawtv/ permanently redirects to 
http://linux.bytesex.org/xawtv/ so update the URL

Originally committed as revision 17592 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-25 20:18:01 +00:00
Daniel Verkamp
f67f485b36 Document 'ffmpeg -formats', patch by Daniel Verkamp, daniel drv nu. 
Originally committed as revision 17536 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-23 01:47:18 +00:00
Stefan Gehrer
adc5abf781 mention raw Chinese AVS video demuxer 
Originally committed as revision 17530 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-22 14:39:06 +00:00
Baptiste Coudurier
a9d3c6692e mention MXF D-10 Mapping muxer in documentation 
Originally committed as revision 17521 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-22 10:47:16 +00:00
Diego Biurrun
fbd5205093 Add supported network protocols section. 
Originally committed as revision 17209 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-13 09:52:15 +00:00
Diego Biurrun
81b55ee5e7 Fix typo: vido --> video 
Originally committed as revision 17191 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-12 22:58:33 +00:00
Diego Biurrun
43dedc1e38 Add raw (de)muxers to list of supported file formats. 
Originally committed as revision 17190 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-12 22:52:03 +00:00
Diego Biurrun
39271be467 Add entries that were missing from the supported file formats list. 
Originally committed as revision 17187 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-12 17:52:05 +00:00
Diego Biurrun
913c3e2ca8 Use more descriptive format names, similar to the format long_names. 
Originally committed as revision 17186 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-12 17:49:10 +00:00
Diego Biurrun
9afc291747 Remove rendering column from list of supported subtitle formats. 
Originally committed as revision 17079 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 22:24:04 +00:00
Björn Axelsson
173c718500 Add missing ffplay subtitle cycling keybinding. 
patch by Björn Axelsson, gecko acc.umu se

Originally committed as revision 17078 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 22:22:26 +00:00
Nicolas Martin
eaf5d0112b NC camera demuxer 
Patch by Nicolas Martin - elvadrias at gmail

Originally committed as revision 17062 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 18:50:32 +00:00
Jai Menon
9a77d59a89 Use libopenjpeg for jpeg2k decoding. 
Patch by Jaikrishnan Menon

Originally committed as revision 17017 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-06 11:49:31 +00:00
Peter Ross
d8964f3afa Electronic Arts TQI decoder 
Originally committed as revision 17002 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-05 08:58:35 +00:00
Diego Biurrun
6ebafef6ee Add XSUB to list of supported subtitle formats. 
Originally committed as revision 16935 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-02 09:40:02 +00:00
Víctor Paesa
cdf5139512 Explain how to add IPv6 support to Cygwin. 
Originally committed as revision 16923 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 21:46:08 +00:00
Stefano Sabatini
bd591ead45 Update preset files documentation to match with r16795. 
Originally committed as revision 16810 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-26 22:23:04 +00:00
Baptiste Coudurier
7eb68edba7 R3D REDCODE demuxer 
Originally committed as revision 16692 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-20 07:42:14 +00:00
Stefan Gehrer
055dc116fc added demuxer for FunCom ISS audio files, 
extended ADPCM decoder by ISS specific IMA variant

Originally committed as revision 16658 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-17 20:08:43 +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
Víctor Paesa
17bdc29039 Document the ld, st, while statements. 
Originally committed as revision 16588 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 21:20:03 +00:00
Víctor Paesa
593b321969 Document the same functions, in the same order, that eval.c has. 
Originally committed as revision 16586 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 21:07:27 +00:00
Stefano Sabatini
44fe71133d Fix documentation for -passlogfile, the argument is not a file name 
but a prefix used to create the complete pass log file name.

Originally committed as revision 16324 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 13:40:02 +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
Víctor Paesa
be8497b0ac Update again Cygwin Ports URL after my sloppy previous commit. 
Originally committed as revision 16297 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-23 20:44:06 +00:00
Víctor Paesa
5dd9799de8 Complete the list of external libraries. 
Originally committed as revision 16290 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-23 10:29:32 +00:00
Víctor Paesa
666a1b348f Advice on compiler versions 
Originally committed as revision 16289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-23 09:09:21 +00:00
Víctor Paesa
9f6bfe8034 Update Cygwin Ports URL. 
Originally committed as revision 16288 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-23 08:57:28 +00:00
Víctor Paesa
8484503e87 Bring up to date the Cygwin docs. 
Originally committed as revision 16287 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-23 08:53:37 +00:00
Víctor Paesa
f496ab12e4 The diffutils package is also needed (for the 'cmp' command). 
Spotted by Ramiro Polla.

Originally committed as revision 16283 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-22 23:30:33 +00:00
Diego Biurrun
a6493a8fbd Rename libavcodec/i386/ --> libavcodec/x86/. 
It contains optimizations that are not specific to i386 and
libavutil uses this naming scheme already.

Originally committed as revision 16270 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-22 09:12:42 +00:00
Kostya Shishkov
6beb8b2612 RV30 decoder 
Originally committed as revision 16247 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-20 18:06:01 +00:00
Diego Biurrun
c9e73264ae Roundup now works from a ffmpeg.org domain as well, so prefer that. 
Originally committed as revision 16177 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 23:45:26 +00:00
Ramiro Polla
2014b51cae documentation: update documentation for minimal w32api version. 
Originally committed as revision 16030 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-07 12:14:44 +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
Kenan Gillet
73b458e354 Commit last ok'ed parts of QCELP decoder and enable it. 
patch by Kenan Gillet, kenan.gillet gmail com

Originally committed as revision 15978 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-02 16:48:05 +00:00
Stefano Sabatini
c2902c9c66 Improve documentation for the -pass and -passlog options. Add mention 
to how the log file is used and specify the default log file name.

Originally committed as revision 15969 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-01 08:27:53 +00:00
Kostya Shishkov
11c0f9eca1 enable RV40 decoder 
Originally committed as revision 15968 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-01 06:40:36 +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
Peter Ross
42b30357be Electronic Arts TGQ video decoder 
Originally committed as revision 15789 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-08 00:29:22 +00:00
Diego Biurrun
63d247eadb Remove duplicated patch submission checklist entry by putting the more 
detailed second entry in place of the first.

Originally committed as revision 15749 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-30 10:05:57 +00:00
Diego Biurrun
a56fbe2ac8 Revert adding controversial 'make checkheaders' item to the development policy. 
Originally committed as revision 15743 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-29 22:51:54 +00:00
Diego Biurrun
2cdba8bfc4 Add 'make checkheaders' to developer guidelines and patch checklist. 
Originally committed as revision 15741 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-29 06:48:59 +00:00
Aurelien Jacobs
485ec4f11e set correct number of fractions for multitable 
fixes the following warning:
** too much @tab (multitable has only 4 column(s)) (l. 443)

Originally committed as revision 15729 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-27 14:16:42 +00:00
Diego Biurrun
bd3151f278 Add subtitle format section. 
Originally committed as revision 15703 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-25 09:08:09 +00:00
Diego Biurrun
9ff0c3883f cosmetics: Slightly update MP3 support entry. 
Originally committed as revision 15702 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-25 08:53:10 +00:00
Diego Biurrun
82ced5a9b4 Mark formats requiring external libs with an 'E' in the format support tables. 
Originally committed as revision 15701 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-25 08:51:46 +00:00
Diego Biurrun
3f33271aa4 Add GSM into list of supported audio codecs. 
Originally committed as revision 15700 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-25 08:44:31 +00:00
Diego Biurrun
360f980b9a cosmetics: Uniformize external library comments. 
Originally committed as revision 15699 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-25 08:41:00 +00:00
David Conrad
f6958006f7 Documentation and changelog update for libspeex decoding 
Originally committed as revision 15698 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-25 06:59:14 +00:00
Diego Biurrun
0f898714d7 Add information about a workaround for MinGW gcc versions. 
based on a patch by Art Clarke, aclarke vlideshow com

Originally committed as revision 15670 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-23 14:39:02 +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
Diego Pettenò
be449fca79 Convert asm keyword into __asm__. 
Neither the asm() nor the __asm__() keyword is part of the C99
standard, but while GCC accepts the former in C89 syntax, it is not
accepted in C99 unless GNU extensions are turned on (with -fasm). The
latter form is accepted in any syntax as an extension (without
requiring further command-line options).

Sun Studio C99 compiler also does not accept asm() while accepting
__asm__(), albeit reporting warnings that it's not valid C99 syntax.

Originally committed as revision 15627 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-16 13:34:09 +00:00
Benoit Fouet
c27c66c3f0 Add a space between frequencies and their units. 
Originally committed as revision 15613 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-13 15:09:04 +00:00
Diego Biurrun
d8d12c1594 Remove obsolete liba52 wrapper code. 
Originally committed as revision 15571 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-06 05:17:57 +00:00
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
Ramiro Polla
126cadc723 Specify minimum version for some MinGW packages. 
Originally committed as revision 15521 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-02 17:39:30 +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
Diego Biurrun
b3de4544e0 Use better table heading names in the supported formats tables. 
Originally committed as revision 15432 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-26 19:58:27 +00:00
Diego Biurrun
4d6a1161c7 small wording fixes 
Originally committed as revision 15358 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-18 08:10:12 +00:00
Diego Biurrun
f236aa47ca wording/spelling 
Originally committed as revision 15333 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-14 22:46:38 +00:00
Ramiro Polla
4a0266a0ec Spelling... 
Originally committed as revision 15327 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-14 22:15:11 +00:00
Michael Niedermayer
1a7f150c9a Add , to clarify sentence. 
Originally committed as revision 15323 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-14 17:30:05 +00:00
Diego Biurrun
8840ce92f7 Fix typos found by ispell. 
Originally committed as revision 15320 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-14 14:37:17 +00:00
Michael Niedermayer
88cdf2f4fe Reword a few sentences to make them clearer. 
Originally committed as revision 15319 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-14 14:14:36 +00:00
Michael Niedermayer
38d174b375 The official guide to swscale for confused developers. 
Originally committed as revision 15316 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-14 02:38:47 +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
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