1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

11903 Commits

Author SHA1 Message Date
David Conrad
30bdefd1de Fix build without yasm
Originally committed as revision 23816 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-27 02:52:43 +00:00
Jason Garrett-Glaser
0178d14fe5 First shot at VP8 optimizations:
- MMXEXT, SSE2 and SSSE3 MC functions
- MMX and SSE4 IDCT dc_add functions

Patch by Jason Garrett-Glaser <darkshikari gmail com> and myself.

Originally committed as revision 23815 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-27 02:01:45 +00:00
David Conrad
0ef1dbedcb VP8 bilinear filter
Originally committed as revision 23813 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-27 01:46:29 +00:00
David Conrad
a02bb835ac vorbisdec: Take channels into account when checking against residue overflow
Fixes issue1969

Originally committed as revision 23812 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-27 01:46:23 +00:00
David Conrad
54fdf5d150 vorbisdec: Fix header parsing with no floor1 partitions
Originally committed as revision 23811 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-27 01:46:20 +00:00
David Conrad
780621b832 vorbisdec: Remove write-only variable
Originally committed as revision 23810 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-27 01:46:14 +00:00
Måns Rullgård
92a544267b vp8: warn and request sample if upscaling specified in header
Originally committed as revision 23809 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-27 00:37:43 +00:00
Måns Rullgård
2829ce4b40 Remove PPC perf counter support
This functionality is better accessed through tools like oprofile.

Originally committed as revision 23808 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-26 22:23:35 +00:00
Måns Rullgård
a788196e20 Remove --enable-gprof flag
gprof is far too intrusive to be of use as a profile for ffmpeg,
and it fails to build in many configurations.  Oprofile is a
better tool for profiling on Linux.

Originally committed as revision 23807 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-26 22:23:29 +00:00
Måns Rullgård
69d12904da Remove unnecessary ../ from include directives
Originally committed as revision 23806 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-26 20:28:44 +00:00
Måns Rullgård
f30d51d74f ARM: fix build with TI compiler
The TI compiler defines __eabi__ to signal that ARM EABI is in use.
We must check for this in addition to the gcc macro __ARM_EABI__.

Originally committed as revision 23804 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-26 18:34:56 +00:00
Måns Rullgård
cbabccc367 ffv1: remove VLAs
Originally committed as revision 23802 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-26 15:53:25 +00:00
Måns Rullgård
02591641f8 shorten: remove VLA and check for buffer overflow
Originally committed as revision 23798 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-26 14:34:21 +00:00
Måns Rullgård
17253f598e alsdec: convert VLAs to fixed size
The maximum value of sub_blocks is 8, a safe size to always allocate on
stack.

Originally committed as revision 23797 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-26 14:34:18 +00:00
Måns Rullgård
70f2314df0 pcx: convert VLAs to malloc/free
Originally committed as revision 23796 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-26 14:34:15 +00:00
Måns Rullgård
164d166e85 lsp: convert variable-length arrays to fixed size
Max LP order is defined to be 16, fixed-size buffers are OK.

Originally committed as revision 23795 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-26 14:34:12 +00:00
Måns Rullgård
5228bcd870 svq1dec: replace VLA with malloc/free
Originally committed as revision 23794 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-26 14:34:08 +00:00
Måns Rullgård
9502441408 huffyuv: remove unnecessary size argument from generate_len_table()
Originally committed as revision 23791 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 19:28:10 +00:00
Måns Rullgård
0912db0206 Make vp8 select h264dsp and use this to pull in mmx intrapred
Originally committed as revision 23790 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 19:10:08 +00:00
Carl Eugen Hoyos
0c59074868 Fix compilation without --enable-gpl.
Originally committed as revision 23789 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 19:06:29 +00:00
Jason Garrett-Glaser
15d31aa1e1 Really fix r23782
Originally committed as revision 23788 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 19:03:03 +00:00
Måns Rullgård
36672bac52 elbg: remove VLAs
Originally committed as revision 23787 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 18:51:25 +00:00
Jason Garrett-Glaser
cd29c2b5a1 Fix c99ism in r23782
Originally committed as revision 23786 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 18:48:45 +00:00
Carl Eugen Hoyos
96da2a6967 Cosmetics: Fix indentation.
Originally committed as revision 23785 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 18:34:03 +00:00
Måns Rullgård
d45b771ca0 huffyuv: make VLAs fixed size
Originally committed as revision 23784 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 18:32:29 +00:00
Jason Garrett-Glaser
4af8cdfc3f 16x16 and 8x8c x86 SIMD intra pred functions for VP8 and H.264
Originally committed as revision 23783 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 18:25:49 +00:00
Jason Garrett-Glaser
d6f8476be4 Make VP8 DSP functions take two strides
This isn't useful for the C functions, but will allow re-using H and V functions
for HV functions without adding separate H and V wrappers.

Originally committed as revision 23782 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 18:14:07 +00:00
Måns Rullgård
becfe99ad5 twinvq: remove VLAs
Originally committed as revision 23775 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 13:43:55 +00:00
Måns Rullgård
9bfb72d9e9 rv34: kill VLAs
Originally committed as revision 23774 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 08:19:20 +00:00
Jason Garrett-Glaser
03ac56e7f1 fix typo in vp8 decoder error message
Originally committed as revision 23765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 04:23:45 +00:00
Måns Rullgård
5113b3bd5c tta: replace potentially huge VLAs with malloc/free in context
Originally committed as revision 23759 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-24 18:17:12 +00:00
Thad Ward
741b5fd44a Set an opaque alpha value when decoding rgba ffv1.
Patch by Thad Ward coderjoe69¤yahoo°com

Originally committed as revision 23757 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-24 15:22:33 +00:00
Måns Rullgård
dd93649b71 Remove VLA in ff_kbd_window_init, limit window size to 1024
Originally committed as revision 23755 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-24 09:42:34 +00:00
Måns Rullgård
796cea09b6 vp6: convert VLA to fixed size
Originally committed as revision 23754 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-24 09:02:44 +00:00
Vitor Sessak
89c7d8058c Fix compilation on x64.
Originally committed as revision 23753 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-24 08:53:32 +00:00
Vitor Sessak
57dbd12b6d Fix asm constraints in apply_window()
Originally committed as revision 23752 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-24 08:46:47 +00:00
Måns Rullgård
986f143a38 alac: change VLAs to fixed size
Originally committed as revision 23751 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-24 08:26:40 +00:00
Vitor Sessak
bc2b368215 SSE-optimized MP3 floating point windowing functions
Originally committed as revision 23750 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-24 07:44:50 +00:00
Måns Rullgård
5262f7ed1d snow: remove unused parameter to mc_block()
Originally committed as revision 23746 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-23 23:44:48 +00:00
Stefan Gehrer
8f910a5621 avoid conditional and division in chroma MV calculation
Originally committed as revision 23745 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-23 21:45:26 +00:00
Måns Rullgård
79aec75792 flacenc: convert VLA to fixed size
Originally committed as revision 23744 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-23 21:22:56 +00:00
Vitor Sessak
47ba787442 Move float-specific function to mpegaudiodec_float.c
Originally committed as revision 23743 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-23 20:45:36 +00:00
Vitor Sessak
9dac6dbb22 Remove pointless condition in #if
Originally committed as revision 23742 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-23 20:43:37 +00:00
Alex Converse
d6e0080175 Fix alphabetization of the CONFIG_HARDCODED_TABLES Makefile section.
Originally committed as revision 23741 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-23 19:32:02 +00:00
Alex Converse
e29af81818 aactab: Tablegenify ff_aac_pow2sf_tab.
Originally committed as revision 23740 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-23 19:30:01 +00:00
Jason Garrett-Glaser
2966cc1849 Update x264asm header files to latest versions.
Modify the asm accordingly.
GLOBAL is now no longoer necessary for PIC-compliant loads.

Originally committed as revision 23739 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-23 19:20:46 +00:00
Ronald S. Bultje
44c70a9b3d Fix a typo, spotted by Diego.
Originally committed as revision 23738 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-23 13:02:05 +00:00
Diego Biurrun
c1bffe25fa Add required #includes to pass 'make checkheaders'.
Originally committed as revision 23736 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-23 11:44:07 +00:00
Måns Rullgård
20843f51e7 Remove OS/2 threads support
OS/2 SMP support is rare, and a pthreads library exists.
No need to keep this code.

Originally committed as revision 23731 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-23 00:08:21 +00:00
Måns Rullgård
9f342dabc6 Remove beosthreads support
Relevant BeOS variants support pthreads, so there is no need to
maintain the beos-native threads interface.

Originally committed as revision 23729 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 23:18:13 +00:00
Måns Rullgård
8fbd4f51a8 Improve some uses of ff_cropTbl with constant offset
Originally committed as revision 23728 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 23:12:48 +00:00
Jason Garrett-Glaser
c31a25e79c Use right-shift instead of division by two.
Patch by Dark Shikari

Originally committed as revision 23723 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 21:12:42 +00:00
Ronald S. Bultje
2b6a950361 Reindent after r23721.
Originally committed as revision 23722 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 20:57:37 +00:00
Ronald S. Bultje
157cb0694a Rename PACK4x8() to PACK4UINT8().
Originally committed as revision 23721 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 20:57:00 +00:00
Alex Converse
fd6eb4a06c Move Parametric Stereo related ps* files to aacps*.
Originally committed as revision 23720 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 19:29:03 +00:00
David Conrad
3b636f21da Native VP8 decoder.
Patch by David Conrad <lessen42 gmail com> and myself.

Originally committed as revision 23719 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 19:24:09 +00:00
Ronald S. Bultje
c6ef6e14cf Change a / 256 into a >> 8.
Originally committed as revision 23718 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 19:19:13 +00:00
Ronald S. Bultje
a815602aa3 Reindent after r23716.
Originally committed as revision 23717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 19:17:41 +00:00
David Conrad
3ad289fca7 Add intra prediction functions for VP8.
Patch by David Conrad <lessen42 gmail com> and myself.

Originally committed as revision 23716 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 19:17:09 +00:00
Ronald S. Bultje
b39a2d19d4 Add a macro to pack 4 bytes into native byte-order so they can be written
at once using a single 32-bit store.

Originally committed as revision 23715 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 19:15:27 +00:00
David Conrad
caaf098cec Make "topright" argument to pred4x4() const.
Patch by David Conrad <lessen42 gmail com>.

Originally committed as revision 23714 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 19:12:54 +00:00
Alex Converse
890fe85f26 Cosmetics whitespace.
Originally committed as revision 23712 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 19:06:35 +00:00
Peter Ross
e10412a334 IFF PBM decoder: Add a pad byte if image width is odd <aleksi dot nurmi at gmail dot com>
Originally committed as revision 23701 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 12:41:17 +00:00
Martin Storsjö
e83aed04b0 Bump micro version, add changelog entry for DTS-ES extension decoding support
Originally committed as revision 23700 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 09:22:21 +00:00
Nick Brereton
d1177cb589 Support DTS-ES extension (XCh) in dca: Cosmetic cleanup
Patch by Nick Brereton, nick at nbrereton dot net

Originally committed as revision 23698 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 08:35:44 +00:00
Nick Brereton
774e9acfa7 Support DTS-ES extension (XCh) in dca: add code to handle DTS-ES extension
Patch by Nick Brereton, nick at nbrereton dot net

Originally committed as revision 23697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 08:34:51 +00:00
Nick Brereton
3d5a9ba1af Support DTS-ES extension (XCh) in dca: update and add channel mapping tables for DTS-ES mappings
Patch by Nick Brereton, nick at nbrereton dot net

Originally committed as revision 23696 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 08:34:02 +00:00
Nick Brereton
6baef06e8f Support DTS-ES extension (XCh) in dca: move original code around to allow reused by DTS-ES code
Patch by Nick Brereton, nick at nbrereton dot net

Originally committed as revision 23695 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 08:33:00 +00:00
Nick Brereton
77b4b7c383 Support DTS-ES extension (XCh) in dca: move subband_samples into context structure
Patch by Nick Brereton, nick at nbrereton dot net

Originally committed as revision 23694 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 08:32:01 +00:00
Martin Storsjö
d99659f0b3 libvorbis: Only drop 1-byte packets at end of stream
This fixes handling of totally silent packets during the encoding, that
also are 1 byte in size.

This fixes issue 2013

Originally committed as revision 23693 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-22 06:53:06 +00:00
Reimar Döffinger
6785e92709 mathematics.h no longer needs config.h, so update tablegen code and
documentation to use it where appropriate.

Originally committed as revision 23680 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-21 17:01:22 +00:00
Alex Converse
19ed4b8647 aacdec: cosmetics: (more) whitespace
Originally committed as revision 23676 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-21 04:14:20 +00:00
Alex Converse
d4e355d5c9 aacdec: cosmetics: whitespace
Originally committed as revision 23675 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-21 04:10:18 +00:00
Alex Converse
ed99e54d67 aacdec: Factorize if (elem_type < TYPE_DSE).
Originally committed as revision 23674 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-21 04:07:19 +00:00
Alex Converse
fda36b5944 aacdec: Handle the first frame being empty case.
Originally committed as revision 23673 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-21 04:05:09 +00:00
Alex Converse
cf3b4d9a78 aacsbr: Make dk signed. There is no point in it being unsigned.
Originally committed as revision 23671 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-20 23:03:32 +00:00
Alex Converse
e90e1f558a psdec: IPD/OPD reset is no longer needed by the context initializer.
Originally committed as revision 23670 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-20 22:13:43 +00:00
Alex Converse
5e071f5339 psdec: Simplify filter addressing by incrementing the "in" pointer.
Originally committed as revision 23669 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-20 22:08:33 +00:00
Nick Brereton
63c3b716d7 Fix typo in macro name.
Patch by Nick Brereton, nick nbrereton net

Originally committed as revision 23668 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-20 22:07:32 +00:00
Alex Converse
c6b0947171 psdec: Replace a division with a shift.
Originally committed as revision 23667 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-20 22:03:00 +00:00
Alex Converse
3fa1a93265 Rename PS bitstream reading functions to have a read_ prefix.
Originally committed as revision 23666 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-20 21:53:51 +00:00
Alex Converse
fd16564b04 Cosmetics: whitespace.
Originally committed as revision 23663 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-20 20:13:11 +00:00
Alex Converse
0d6b3269ea Use memcpy() where appropriate in PS stereo processing remapping.
Originally committed as revision 23662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-20 20:06:41 +00:00
Alex Converse
d23077af56 Allow PS envelope fixup when ps->num_env_old <= 1.
It is already rejected by the "source >= 0 && source != ps->num_env" 0 envelope
case and is perfectly legally for the suppressed final envelope case.

Originally committed as revision 23661 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-20 19:38:08 +00:00
Alex Converse
bd9e0e2905 10l: aacsbr: Fix f_master[2] calculation when k2diff == -1.
Originally committed as revision 23660 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-20 19:24:18 +00:00
Alex Converse
78ba1d39d9 Document the PS_BASELINE define.
Originally committed as revision 23659 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-20 17:28:52 +00:00
Alex Converse
284b041b1c Remove iid_mode from the PS context.
Originally committed as revision 23658 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-20 17:15:28 +00:00
Vitor Sessak
4233ce315c Fix breakage in compilation with --disable-mpegaudio-hp introduced in
r23646.

Originally committed as revision 23656 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-20 13:00:24 +00:00
Måns Rullgård
6a74b1272e Remove libfaad wrapper
Originally committed as revision 23653 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-20 10:24:05 +00:00
Alex Converse
1076b0d093 psdec: Factorize iid/icc/ipd/opd parameter bitstream reading.
Originally committed as revision 23652 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-19 23:53:21 +00:00
Alex Converse
a20639017b Add HE-AAC v2 support to the AAC decoder.
Originally committed as revision 23647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-19 14:14:51 +00:00
Vitor Sessak
4d49a5a785 Factorize the mpegaudio windowing code in a function and call it by a
function pointer. Should allow for ASM optimizations.

Originally committed as revision 23646 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-19 09:56:05 +00:00
Laurent Aimar
164aab02a0 MPEG-2 DXVA2 implementation
It allows VLD MPEG-2 decoding using DXVA2 (GPU assisted decoding API under
VISTA and Windows 7).
 It is implemented by using AVHWAccel API.

Originally committed as revision 23644 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-18 20:07:43 +00:00
Martin Storsjö
1204a13c48 libvorbis: Use memmove instead of memcpy for shifting data
Originally committed as revision 23631 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-16 19:03:54 +00:00
Janne Grunau
08943c0bd1 dvbsub: parse display definition segment
The display definition segment is used to properly display SD DVB subtitles in
HD video streams.

Originally committed as revision 23626 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-16 13:07:12 +00:00
Baptiste Coudurier
891263eff2 Fix svq3 watermark log uncompress on 64bit, probably fixes issue 1263
Originally committed as revision 23620 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-15 22:38:16 +00:00
Baptiste Coudurier
9a191b3a21 Support gray16be and rgb48be in mov
Originally committed as revision 23608 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-15 09:14:00 +00:00
Martin Storsjö
caea217d37 nellymoserdec: Increase the log level of messages when failing to decode data
Originally committed as revision 23606 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-14 14:09:00 +00:00
Martin Storsjö
133cd270f8 Reindent
Originally committed as revision 23605 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-14 14:07:22 +00:00
Martin Storsjö
c5d68fbd49 nellymoserdec: Simplify calculation of numbers of blocks
Originally committed as revision 23604 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-14 14:06:38 +00:00