RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-29 10:43:15 +00:00
Code Issues Projects Releases Wiki Activity
17,786 Commits 37 Branches 400 Tags 262 MiB
516c5f88a1
Commit Graph

8658 Commits

Author SHA1 Message Date
Diego Biurrun
70e493991d cosmetics: Place all subtitle entries together. 
Originally committed as revision 16934 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-02 09:35:23 +00:00
Justin Ruggles
faeb2bd41d flacdec: set default sample_fmt before parsing extradata 
Originally committed as revision 16926 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-02 01:53:40 +00:00
Diego Biurrun
6bf959fee5 Add av_unused to conditionally used variable, fixes the warning: 
h264.c:6464: warning: unused variable 'dir'

Originally committed as revision 16925 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-02 00:35:25 +00:00
Kostya Shishkov
55b557ece1 Silence compiler warnings for XL decoder 
Originally committed as revision 16921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 16:14:54 +00:00
Kostya Shishkov
b709397530 Make WNV1 decoder use temporary buffer for bit-reversed input 
Originally committed as revision 16920 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 16:11:33 +00:00
Diego Biurrun
94f694a476 cosmetics: Remove period after copyright statement non-sentence. 
Originally committed as revision 16919 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 15:52:01 +00:00
Kostya Shishkov
ad4d0b9ef2 Make TM2 decoder byteswap input into separate buffer instead of doing it in-place. 
Originally committed as revision 16918 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 15:27:44 +00:00
Kostya Shishkov
a2a986371c Factorize stream reading in TM2 decoder 
Originally committed as revision 16917 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 15:20:20 +00:00
Kostya Shishkov
3ffabd4e49 Silence two pointer assignment compiler warnings in rv34.c 
Originally committed as revision 16916 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 15:03:40 +00:00
Kostya Shishkov
5d44b2a138 Silence useless compiler warning when passing AVFrame* instead of AVPicture* 
to ff_msrle_decode()

Originally committed as revision 16915 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 14:44:51 +00:00
Diego Biurrun
bc4cccd483 Remove H.264 encoder initialization. 
We have no H.264 encoder to speak of and this produces warnings.

Originally committed as revision 16914 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 14:07:08 +00:00
Diego Biurrun
bad5537e2c Use full internal pathname in doxygen @file directives. 
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 02:00:19 +00:00
Diego Biurrun
65ffe3e85c Fix filenames in doxygen comments. 
Originally committed as revision 16911 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 01:29:30 +00:00
Baptiste Coudurier
7591b30499 remove some warnings due to avctx->execute 
Originally committed as revision 16909 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-31 22:49:58 +00:00
Måns Rullgård
a95d00b287 shorten: trivial simplification of signature check 
Originally committed as revision 16908 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-31 22:30:49 +00:00
Ben Hutchings
f579d24bad assume widescreen when ratio also > 17, patch by Ben Hutchings, ben at decadent dot org dot uk 
Originally committed as revision 16907 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-31 22:16:17 +00:00
Baptiste Coudurier
a4fd53c427 fix decoding 720p50 audio samples 
Originally committed as revision 16906 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-31 22:10:23 +00:00
Justin Ruggles
7f3a6a0553 cosmetics: change comment type and vertical alignment 
Originally committed as revision 16882 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-31 02:11:37 +00:00
Justin Ruggles
64cb376562 cosmetics: add some documentation to FLACContext 
Originally committed as revision 16881 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-31 02:10:43 +00:00
Roman Shaposhnik
1a969d6dfe Cosmetics: fixing indentation 
Originally committed as revision 16880 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-31 01:50:18 +00:00
Roman Shaposhnik
77cd35cdb5 unrolling encoding loops 
Originally committed as revision 16879 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-31 01:46:25 +00:00
Roman Shaposhnik
b45ba151cf Cosmetics: simplifying static initialization 
Originally committed as revision 16878 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-31 01:41:04 +00:00
Roman Shaposhnik
85eca52be4 simplifying DIF encoding process 
Originally committed as revision 16877 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-31 01:39:05 +00:00
Roman Shaposhnik
76bd5997a9 Cosmetics: fixing the indentation 
Originally committed as revision 16876 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-31 01:37:31 +00:00
Roman Shaposhnik
9b8390bfbe factoring code into dv_init_enc_block 
Originally committed as revision 16875 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-31 01:36:38 +00:00
Roman Shaposhnik
5c2a9dd64e Cosmetics: replacing 0 with NULL for pointer assignment 
Originally committed as revision 16874 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-31 01:36:00 +00:00
Roman Shaposhnik
2331854d0b Cosmetics: moving the function definition around 
Originally committed as revision 16873 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-31 01:35:29 +00:00
Roman Shaposhnik
b25d439233 Replacing the constant with a macro 
Originally committed as revision 16872 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-31 01:34:44 +00:00
Justin Ruggles
82159ad992 flacdec: add support for SAMPLE_FMT_32 
Originally committed as revision 16871 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-31 01:20:40 +00:00
Bitbreaker/METALVOTZE X
99b3812265 Fix documentation of the return value of avcodec_encode_video(). 
ripped out of a patch by Bitbreaker/METALVOTZE X bitbreaker ihlaid de Y

Originally committed as revision 16870 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-31 00:45:34 +00:00
Diego Biurrun
67a7e4dbcf Use '#if defined()' for OS-specific preprocessor checks. 
Avoids some warnings about undefined preprocessor directives.

Originally committed as revision 16869 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-30 23:50:13 +00:00
Måns Rullgård
e1f7cb7fa0 ARM: NEON optimised vector_fmul_window 
Originally committed as revision 16868 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-30 23:13:19 +00:00
Måns Rullgård
dd927e2e62 ARM: NEON optimised vector_fmul 
Originally committed as revision 16867 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-30 23:13:15 +00:00
Stefan Gehrer
8915009813 remove duplicate tables 
Originally committed as revision 16866 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-30 20:39:39 +00:00
Alex Converse
63cae55d62 Use the new RDFT code in the QDM2 decoder. 
Originally committed as revision 16865 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-30 20:33:29 +00:00
Alex Converse
6860254044 Add the rdft family of transforms (fft/ifft of an all real sequence) to dsputil. 
Originally committed as revision 16864 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-30 20:15:48 +00:00
Diego Biurrun
dc8a7c93d3 Add missing void keyword to parameterless function declarations. 
Originally committed as revision 16860 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-30 18:38:25 +00:00
Gwenole Beauchesne
f92a6c66ed Record B-fraction index from frame header and two fields from entry point structure 
into VC-1 context.

Patch by Gwenole Beauchesne
(gbeauchesne <whirlpool> splitted <dash> desktop <dit> com)
Thread [PATCH][VC-1] Record extra syntax elements for VA API support

Originally committed as revision 16859 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-30 17:15:08 +00:00
Gwenole Beauchesne
3021a8a70b Make ff_h263_resync() return the bit position of the resync_marker or 
a negative number if none was found.
Patch by Gwenolé Beauchesne: gbeauchesne splitted minus desktop com

Originally committed as revision 16858 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-30 17:13:03 +00:00
Gwenole Beauchesne
73f184936d Use a constant instead of a magic number. 
Patch by Gwenolé Beauchesne: gbeauchesne splitted minus desktop com

Originally committed as revision 16856 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-30 08:18:06 +00:00
Stefan Gehrer
2ed421134e avoid indeterminate order of accessing src 
Originally committed as revision 16855 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-30 06:38:46 +00:00
Gwenole Beauchesne
2e584eea4b cosmetics: Add empty line for consistent formatting. 
patch by Gwenolé Beauchesne, gbeauchesne splitted-desktop com

Originally committed as revision 16852 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-29 22:08:32 +00:00
Alex Converse
eea325645c Mark ff_fft_end av_cold. 
Originally committed as revision 16851 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-29 17:08:51 +00:00
Loren Merritt
5a446bc88e fix an overflow in vc1 intra overlap filter 
Originally committed as revision 16845 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-28 11:12:19 +00:00
Kostya Shishkov
81169111ef Fix Doxygen comments for VC-1 decoder. 
Originally committed as revision 16843 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-28 07:16:52 +00:00
Kostya Shishkov
1aa7335149 Fix Doxygen comments for RV3/4 decoder. 
Originally committed as revision 16842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-28 07:16:20 +00:00
Kostya Shishkov
20642e2840 Fix Doxygen comments for APE decoder. 
Originally committed as revision 16841 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-28 07:15:22 +00:00
Måns Rullgård
ca6532f620 ARM: remove some unused macro arguments 
Originally committed as revision 16824 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-27 16:34:10 +00:00
Måns Rullgård
d8f9269dc6 ARM: reorder some instructions in put_pixels*_arm for speed gains 
Originally committed as revision 16823 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-27 16:06:51 +00:00
Måns Rullgård
00c5727d90 ARM: replace jump tables with conditional branches 
Originally committed as revision 16822 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-27 16:06:47 +00:00
Måns Rullgård
d9e68f5c1a ARM: replace explicit literal loads with ldr Rd, =lit 
Originally committed as revision 16821 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-27 16:06:44 +00:00
Måns Rullgård
fc252eba02 ARM: change alignment of loops in put_pixels*_arm to 32 
Originally committed as revision 16820 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-27 16:06:41 +00:00
Måns Rullgård
4f928a4d2d ARM: optimised mid_pred() 
Originally committed as revision 16819 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-27 16:06:38 +00:00
Måns Rullgård
1214bd86dc ARM: allow register operands for shifts in MULL() 
Originally committed as revision 16818 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-27 16:06:34 +00:00
Stefan Gehrer
620b8a2ed7 fix doxygen file reference 
Originally committed as revision 16816 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-27 06:04:01 +00:00
Aurelien Jacobs
73c87551e5 vp5: don't try decoding a P frame before any I frame was parsed 
fix issue802

Originally committed as revision 16813 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-27 00:23:27 +00:00
Diego Biurrun
99ed41a808 Fix filenames in Doxygen comments. 
Originally committed as revision 16811 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-26 22:51:16 +00:00
Stefano Sabatini
e1b6bdbb83 Change "H.263 Intel" long name to "Intel H.263". 
Originally committed as revision 16808 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-26 19:46:47 +00:00
Kostya Shishkov
9289a32a8e Fix AAC data smuggling: 
aactab.h declares only 316 of 428 elements in ff_aac_pow2sf_tab[]

Originally committed as revision 16805 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-26 13:44:09 +00:00
Benoit Fouet
a6cef9651d Remove unneeded check. 
Originally committed as revision 16803 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-26 09:42:48 +00:00
Benoit Fouet
a44cb89b0f Fix an exploit in indeo by checking we are not writing out of the strip array. 
Fixes issue 655

Originally committed as revision 16802 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-26 09:41:23 +00:00
David Conrad
137ae32760 Workaround for gcc 3.4 to align sh properly 
Originally committed as revision 16797 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-26 03:40:48 +00:00
Diego Biurrun
c60208e7a1 Directly #include some required headers. 
Originally committed as revision 16780 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-25 19:11:10 +00:00
Reimar Döffinger
724cc2dfaa Use AV_WL32/AV_WB32 in bitstream.h 
Originally committed as revision 16778 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-25 18:12:13 +00:00
Stefano Sabatini
57be00bea7 Make more descriptive the long names for the various variants of H.263. 
Originally committed as revision 16775 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-25 16:59:48 +00:00
Måns Rullgård
bd53b426b7 ARM: NEON optimised H.264 weighted prediction 
Originally committed as revision 16771 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-25 13:04:45 +00:00
Måns Rullgård
5a29589b81 ARM: NEON optimised H.264 biweighted prediction 
Originally committed as revision 16770 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-25 13:04:41 +00:00
Diego Biurrun
4ceb4e3102 Add required headers to fix warnings during 'make checkheaders'. 
Originally committed as revision 16769 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-25 11:16:25 +00:00
Justin Ruggles
aeb987cebf flacdec: get total number of samples from STREAMINFO 
Originally committed as revision 16768 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-25 02:27:02 +00:00
Justin Ruggles
ce7e82144f move FLAC_STREAMINFO_SIZE to flac.h 
Originally committed as revision 16766 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-25 00:34:32 +00:00
Justin Ruggles
d38b88213e define FLAC metadata types in flac.h 
Originally committed as revision 16765 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-25 00:33:25 +00:00
Justin Ruggles
9f3d3ecf92 flacdec: cosmetics: some line wrapping at 80 chars 
Originally committed as revision 16763 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-24 19:05:52 +00:00
Justin Ruggles
1df0390eed flacdec: cosmetics: indentation 
Originally committed as revision 16762 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-24 18:52:30 +00:00
Justin Ruggles
1bec121f9e flacdec: cosmetics: use consistent coding style (K&R) 
Originally committed as revision 16761 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-24 18:51:43 +00:00
Diego Biurrun
799fde37cc Add a check for ppc4xx instructions; rename preprocessor directive accordingly. 
Originally committed as revision 16756 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-24 17:44:46 +00:00
Diego Biurrun
f5b96597bd Remove pointless #if HAVE_ALTIVEC around internal header #include 
and function declarations.

Originally committed as revision 16755 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-24 17:32:06 +00:00
Justin Ruggles
13de8a080a cosmetics: indentation 
Originally committed as revision 16753 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-24 16:13:21 +00:00
Justin Ruggles
5305f40bb8 flacdec: change several AV_LOG_DEBUG to AV_LOG_ERROR 
Originally committed as revision 16752 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-24 16:03:17 +00:00
Justin Ruggles
9f2db54594 flacdec: remove another unneeded debugging statement 
Originally committed as revision 16751 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-24 16:02:30 +00:00
Justin Ruggles
f7f3e3bf4a flacdec: remove unneeded debugging statements 
Originally committed as revision 16750 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-24 16:01:20 +00:00
Justin Ruggles
c5706efd57 flacdec: remove some unused code 
Originally committed as revision 16749 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-24 15:46:19 +00:00
Diego Biurrun
175da7dab7 Add required headers to fix 'make checkheaders'. 
Originally committed as revision 16746 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-24 14:46:00 +00:00
Stefan Gehrer
19e017f211 remove alloc_table_0 and alloc_table_2, the same 
data exists in alloc_table_1 and alloc_table_3

Originally committed as revision 16745 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-24 14:32:22 +00:00
Stefan Gehrer
45beb850de remove zigzag_scan8x8, it is the same as ff_zigzag_direct 
Originally committed as revision 16744 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-24 14:30:15 +00:00
Stefan Gehrer
3e7233688a avoid duplication of size_table and offset_table 
Originally committed as revision 16743 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-24 14:28:08 +00:00
Stefan Gehrer
fa79489fd3 avoid duplication of dquant_code 
Originally committed as revision 16742 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-24 14:26:40 +00:00
Vitor Sessak
e0df9e4425 Do not allocate RoqTempData on the stack 
Originally committed as revision 16739 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-24 08:15:43 +00:00
Justin Ruggles
8f51144bf4 rename flac.c to flacdec.c 
Originally committed as revision 16735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-23 22:27:19 +00:00
Andreas Öman
cf92cec7d8 Avoid allocating MPADecodeContext on stack. 
Instead move relevant fields into MPADecodeHeader and use it
where appropriate.

Originally committed as revision 16728 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-23 12:09:32 +00:00
Kostya Shishkov
1cae2ef9a6 Remove the block with always false condition from vc1_parse_frame_header() 
Originally committed as revision 16726 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-23 06:33:04 +00:00
Kostya Shishkov
a28d522491 VC-1 postproc field is 2 bits wide while decoder read only single bit. 
Spotted by Stephen Warren.

Originally committed as revision 16725 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-23 06:31:17 +00:00
Justin Ruggles
959e000627 flacdec: add support for 3 additional sample rate codes 
Originally committed as revision 16723 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-22 22:23:58 +00:00
Alex Converse
3c4ea6d5ab Mark ff_fft_init with av_cold. 
Originally committed as revision 16722 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-22 19:48:10 +00:00
Alex Converse
8f05c995fd Clean up FFT related comments. 
Originally committed as revision 16721 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-22 19:46:23 +00:00
Baptiste Coudurier
4d6f600c58 Add const, remove warning: 
libavcodec/audioconvert.c:190: warning: initialization discards qualifiers from pointer target type

Originally committed as revision 16716 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-22 00:31:26 +00:00
Kostya Shishkov
716ba2d01c VMD first chunk of audio is not coded as many separate chunks of block_align 
size. Thus, make demuxer and decoder handle it as a whole.

Originally committed as revision 16708 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-21 13:24:35 +00:00
Carl Eugen Hoyos
0d9becc77c Sort VdpPictureInfo alphabetically. 
Originally committed as revision 16705 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-20 22:53:25 +00:00
Carl Eugen Hoyos
27052238c0 Cosmetics: Fix indentation after last commit. 
Originally committed as revision 16700 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-20 09:36:28 +00:00
NVIDIA Corporation
c5b42f4a80 Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can 
be used by video players.

Original patch by NVIDIA corporation.

Originally committed as revision 16699 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-20 09:28:36 +00:00
Diego Biurrun
c2fef0c163 Use "" instead of <> when #including non-system headers. 
Originally committed as revision 16689 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-19 23:41:46 +00:00