1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Commit Graph

859 Commits

Author SHA1 Message Date
Vitor Sessak
66d4c62806 Do not reimplement ff_celp_lp_synthesis_filterf().
Originally committed as revision 17562 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-24 18:11:42 +00:00
Diego Biurrun
7c2d92fe08 Fix xvmc object dependencies.
Originally committed as revision 17534 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-22 23:13:00 +00:00
Aurelien Jacobs
d52b39c79c fix missing dependencies
Originally committed as revision 17445 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-19 00:27:57 +00:00
Diego Biurrun
31866c4677 The 3DNow! and SSE FFT optimizations depend on the yasm optimizations in
x86/fft_mmx.asm, so only build them if the latter is built.

Originally committed as revision 17440 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 23:32:41 +00:00
Diego Biurrun
ca14e2a8b7 Handle conditional compilation of CPU-specific FFT code in the Makefile.
Also replace one coarse MMX condition with more fine-grained
3DNow!/3DNowExt!/SSE conditions.

Originally committed as revision 17409 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 00:11:49 +00:00
Diego Biurrun
3d17b948fd mpegvideo_xvmc.o depends on mpegvideo.o.
Originally committed as revision 17405 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-17 23:59:53 +00:00
Diego Biurrun
ed80a059ba Add missing object dependencies: eatqi.o depends on mpeg12.o.
Originally committed as revision 17366 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 10:38:23 +00:00
Diego Biurrun
fc2dd7e3de Remove redundant CONFIG_XVMC option, CONFIG_MPEG_XVMC_DECODER suffices.
Originally committed as revision 17229 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 15:37:40 +00:00
Diego Biurrun
9e47796048 Rename xvmc.c --> mpegvideo_xvmc.c as suggested by Ivan.
Originally committed as revision 17228 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 15:30:40 +00:00
Diego Biurrun
aea0b32cbc Make xvmc.h an installed header, applications like MPlayer need it.
Originally committed as revision 17226 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 13:40:53 +00:00
Diego Biurrun
fd949a6353 Revert adding a _pixfmt to vdpau/xvmc header names.
Since vdpau.h was an installed header this would break API.

Originally committed as revision 17225 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 13:37:18 +00:00
Diego Biurrun
db68113d5e cosmetics: alphabetical order
Originally committed as revision 17224 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 13:12:49 +00:00
Zuxy Meng
ecb24904fe add SSE2 version of vp6_filter_diag
original patch by Zuxy Meng  zuxy.meng _at_ gmail _dot_ com

Originally committed as revision 17195 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-13 00:02:33 +00:00
Sebastien Lucas
6af3c226c3 add MMX version of vp6_filter_diag
original patch by Sebastien Lucas  sebastien.lucas _at_ gmail _dot_ com

Originally committed as revision 17194 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-12 23:52:52 +00:00
Reimar Döffinger
29ef9575ab Fix compilation, there is no file vdpauvideo.c, only vdpau.c
Originally committed as revision 17185 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-12 17:27:53 +00:00
Diego Biurrun
508048afe2 10l: Rename vdpau.h --> vdpau_pixfmt.h in the Makefile as well.
Originally committed as revision 17169 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-12 01:07:13 +00:00
Diego Biurrun
9b4cfc360a Rename vdpauvideo.c --> vdpau.c and xvmcvideo.c --> xvmc.c to better fit
the general libavcodec naming structure.

Originally committed as revision 17152 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 12:01:59 +00:00
Aurelien Jacobs
26f3ae828b move vp6_filter_diag4() to a new vp6dsp.c file and use it throught dsputil
Originally committed as revision 17111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-09 23:37:31 +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
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
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
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
Carl Eugen Hoyos
2b3242253d Add mpeg1_vdpau decoder.
Originally committed as revision 16640 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-16 16:50:32 +00:00
NVIDIA Corporation
d37edddc09 Add VDPAU hardware accelerated decoding for MPEG1 and MPEG2 which can
be used by video players.

Original patch by NVIDIA corporation.

Originally committed as revision 16628 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-16 02:14:07 +00:00
Michael Niedermayer
cb595b7f02 Add dummy mp1_decoder to complement the existing dummy mp2/mp3 decoders.
Originally committed as revision 16581 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 19:32:08 +00:00
Carl Eugen Hoyos
10652dd54f Fix OBJS-$(CONFIG_H264_VDPAU_DECODER).
Originally committed as revision 16522 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-10 23:17:07 +00:00
Stefano Sabatini
78acb9e74b Move the AVCodecContext options definition to a dedicated file, reduce
the utils.c clutter.

Originally committed as revision 16514 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-10 09:53:21 +00:00
Diego Biurrun
ed09249c71 The SVQ3 decoder uses ff_svq1_packet_checksum from svq1dec.c.
Originally committed as revision 16486 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-07 22:54:59 +00:00
Aurelien Jacobs
16cda1535e ensure that no GPL code is linked to LGPL only libavcodec
Originally committed as revision 16456 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-06 22:01:57 +00:00
Carl Eugen Hoyos
272081b0f8 Export VDPAU support by installing vdpau.h.
Originally committed as revision 16445 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-05 23:25:58 +00:00
NVIDIA Corporation
369122dd77 Add VDPAU hardware accelerated decoding for H264 which can be used by
video players.

Original patch by NVIDIA corporation.

Originally committed as revision 16431 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-04 23:55:27 +00:00
Michael Niedermayer
a6d18a0e6a Move metadata API from avcodec to avformat.
Originally committed as revision 16425 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-04 18:58:49 +00:00
Michael Niedermayer
47146dfbf6 Generic metadata API.
avi is updated as example.
No version bump, the API still might change slightly ...
No update to ffmpeg.c as requested by aurel.

Originally committed as revision 16424 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-04 18:48:37 +00:00
Jason Garrett-Glaser
37fed10087 Add x264 SSE2 iDCT functions to H.264 decoder.
Originally committed as revision 16409 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-03 00:46:17 +00:00
Diego Biurrun
79cb09b2f7 consistency cosmetics: Rename POWERPC identifiers to PPC.
Originally committed as revision 16359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-27 11:33:26 +00:00
Michael Niedermayer
92799d3213 Enable faxcompr.
Originally committed as revision 16349 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 18:42:26 +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
Jason Garrett-Glaser
a22eff36f9 Port x264 deblocking code to libavcodec.
This includes SSE2 luma deblocking code and both MMXEXT and SSE2 luma
intra deblocking code for H.264 decoding. This assembly is available
under --enable-gpl and speeds decoding of Cathedral by 7%.

Originally committed as revision 16239 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-19 13:45:13 +00:00
Måns Rullgård
a2fc0f6a6d ARM: replace "armv4l" with "arm"
Originally committed as revision 16179 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-17 00:54:54 +00:00
Diego Biurrun
b24298badc Switch xvmc over to a CONFIG_ option.
Originally committed as revision 16153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-15 22:22:51 +00:00
Måns Rullgård
c598cf25f4 ARM: NEON optimised h264_idct_add
Originally committed as revision 16150 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-15 22:12:51 +00:00
Måns Rullgård
1cce897aad ARM: NEON optimised {put,avg}_h264_chroma_mc[48]
Originally committed as revision 16147 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-15 22:12:41 +00:00
Måns Rullgård
7eec43289a ARM: NEON optimised simple_idct
Originally committed as revision 16146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-15 22:12:37 +00:00
Måns Rullgård
569f5a756a ARM: NEON optimised put_pixels functions
Originally committed as revision 16145 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-15 22:12:32 +00:00
Luca Barbato
537db58b6c Let imgresample altivec code build
Originally committed as revision 16093 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-13 10:53:30 +00:00
Baptiste Coudurier
193ce3ab78 dnxhd get_pixels_8x4_sym sse2
Originally committed as revision 16072 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-12 00:19:14 +00:00
David Conrad
a1546009ac Fix compilation with only Theora decoder enabled
Originally committed as revision 16047 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-11 00:33:02 +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
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
Diego Biurrun
6dbdf2f26e Handle AltiVec objects in a more elegant fashion, similar to MMX.
Originally committed as revision 15960 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-30 17:00:08 +00:00
Diego Biurrun
52ad2f390e Remove ineffectual hack that attempts to build ppc/check_altivec.o without
AltiVec flags. The flags are set by configure and used to compile all files
anyway. Setting extra AltiVec options here just duplicates them for the files
for which they are set.

Originally committed as revision 15959 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-30 16:57:28 +00:00
Diego Biurrun
10ac361827 Do not duplicate AAN DCT tables in dct-test.c.
Originally committed as revision 15948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-28 00:32:24 +00:00
Diego Biurrun
2d70cc38c5 Add missing '-test' in name of imgresample test.
Originally committed as revision 15947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-28 00:00:11 +00:00
Diego Biurrun
2a023c36ea Only build the imgresample test if the old scaler was enabled.
Originally committed as revision 15941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-26 15:09:05 +00:00
Diego Biurrun
e8ed9b7a73 Automatically check the dependencies for the AAN DCT tables.
This also makes the AAN DCT tables individually selectable.

Originally committed as revision 15940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-26 15:07:03 +00:00
Diego Biurrun
8b22017f38 Move aanscales tables to their own file; fixes compilation without encoders.
based on a patch by David Geldreich, david.geldreich free fr

Originally committed as revision 15939 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-26 13:38:13 +00:00
Måns Rullgård
d270cb4ae4 ARM: move dct_unquantize_h263_*_armv5te asm to separate file
Originally committed as revision 15917 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-23 19:11:44 +00:00
Diego Biurrun
d1eb20e878 Get rid of last ifdef HAVE_MMX. Instead, all MMX-specific objects are gathered
into a separate variable which is added to OBJS if MMX is enabled.

Originally committed as revision 15898 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-20 23:04:04 +00:00
Diego Biurrun
f0e602351e cosmetics: Consistently place HEADERS before OBJS in all Makefiles.
Originally committed as revision 15896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-20 22:53:18 +00:00
Diego Biurrun
0d2d0f97a5 Move FFT-specific MMX optimizations out of the 'ifdef HAVE_MMX' block.
The MMX dependency is already handled by configure.

Originally committed as revision 15895 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-20 22:50:13 +00:00
Diego Biurrun
d785a67066 cosmetics: indentation
Originally committed as revision 15894 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-20 22:48:51 +00:00
Diego Biurrun
39fdda2bf1 Use standard OBJS-$(HAVE_MMX) trick for MMX objects instead
of surrounding them by an ifdef.

Originally committed as revision 15893 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-20 22:47:18 +00:00
Diego Biurrun
45e730c5e5 cosmetics: Add a few more explanatory comments to the object sections.
Originally committed as revision 15876 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-18 22:48:43 +00:00
Diego Biurrun
a261890432 cosmetics: Sort processor-specific object lines into alphabetical order.
Originally committed as revision 15875 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-18 22:37:22 +00:00
Diego Biurrun
40b509b36b Add a Makefile variable for the old scaler that gets enabled when the new
scaler is disabled to get rid of a Makefile ifdef.

Originally committed as revision 15867 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-17 22:51:59 +00:00
Diego Biurrun
767d3e7bf7 Revert previous commit: the libavcodec/i386/fft_*.o objects depend on
libavcodec/i386/fft_mmx.o, which depends on yasm.

Originally committed as revision 15866 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-17 21:56:34 +00:00
Diego Biurrun
ba01d867f5 Only the yasm-dependent objects should be enabled by a yasm conditional.
Originally committed as revision 15865 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-17 19:01:25 +00:00
Diego Biurrun
c6786edb3c cosmetics: Group ppc-specific objects together.
Originally committed as revision 15863 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-17 16:38:50 +00:00
Diego Biurrun
607ffa34ba cosmetics: Group ARM objects sections together.
Originally committed as revision 15856 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-17 15:36:28 +00:00
Diego Biurrun
e9e74e0ad5 cosmetics: Reorder processor-specific entries alphabetically.
Originally committed as revision 15855 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-17 15:09:45 +00:00
Peter Ross
28245435d9 Electronic Arts TGQ/TQI/MAD IDCT algorithm
Originally committed as revision 15790 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-08 00:38:10 +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
Vitor Sessak
08c433972e Use ff_dot_productf() in ra288.c
Originally committed as revision 15757 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-30 22:24:40 +00:00
Måns Rullgård
83ad74e708 ARM: move VFP DSP functions to dsputils_vfp.S
Originally committed as revision 15727 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-27 00:25:16 +00:00
Måns Rullgård
ede725104b cosmetic: align backslashes in makefiles
Originally committed as revision 15717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 15:21:45 +00:00
Måns Rullgård
864ac5d648 Merge OBJS-$(FOO) lists with same FOO
Originally committed as revision 15716 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 14:26:28 +00:00
Måns Rullgård
c87348a922 Use OBJS variable for all object files
There is no longer any need to differentiate the object files
by source type.

Originally committed as revision 15708 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-25 14:00:28 +00:00
Måns Rullgård
4f03499329 Add CONFIG_GOLOMB and auto-select when needed
Originally committed as revision 15706 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-25 13:51:47 +00:00
Måns Rullgård
47a158cb8b Auto-enable CONFIG_MDCT when needed
Originally committed as revision 15705 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-25 13:51:43 +00:00
Diego Biurrun
6e587953b9 cosmetics: Change the order of mlp parser objects to be consistent.
Originally committed as revision 15697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-25 01:28:29 +00:00
Diego Biurrun
a79d1aed48 Move declaration of mlp decoder dependency on mlp parser to the Makefile
where all other such dependencies are declared.

Originally committed as revision 15696 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-25 01:21:43 +00:00
Måns Rullgård
b6bb00b07d Build MMX/SSE FFT only if CONFIG_FFT is set
Originally committed as revision 15692 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 23:18:21 +00:00
Måns Rullgård
1848f7d9f9 Auto-enable CONFIG_FFT for codecs that need it
Originally committed as revision 15686 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 21:44:54 +00:00
Kenan Gillet
4599d22c0c Split off celp_filters.[ch] from acelp_filters.[ch] for the QCELP decoder.
patch by Kenan Gillet, kenan.gillet gmail com

Originally committed as revision 15680 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 21:29:23 +00:00
David Conrad
ae14f311f8 Speex decoding via libspeex
Originally committed as revision 15676 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 06:29:05 +00:00
Baptiste Coudurier
da396bf84e dnxhd parser
Originally committed as revision 15673 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 01:38:30 +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
Kostya Shishkov
fca506dfb6 Add RLE4 and RLE8 decoding support for BMP
Originally committed as revision 15390 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-23 08:45:12 +00:00
Kostya Shishkov
44aa9771c9 Factorize out code used for MS RLE format decoding in different decoders.
Originally committed as revision 15356 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-18 05:20:54 +00:00
Justin Ruggles
406ab5cc97 add a separate line in Makefile for E-AC-3 decoder and only compile it when
GPL is enabled. fixes building without GPL or with liba52.

Originally committed as revision 15151 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-02 04:04:26 +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
1f6a594de4 turn on E-AC-3 decoding support and update the Changelog
Originally committed as revision 15103 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:08:18 +00:00
Justin Ruggles
c5b930e674 1000l to me. committed to wrong repo. revert last commit.
Originally committed as revision 14953 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 22:57:25 +00:00
Justin Ruggles
e23e4de3ae cosmetics: rename some functions from *get_* to *decode_*
Originally committed as revision 14952 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 22:55:08 +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
Diego Biurrun
0da49fca79 Untangle mpeg12.c and mdec.c so that mdec.c can be compiled separately.
Originally committed as revision 14851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 20:52:26 +00:00
Jai Menon
e13894e80e alacenc: last few hunks approved by michael
Originally committed as revision 14845 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 17:20:41 +00:00
Ramiro Polla
c50da3ad6c flacenc, lpc: Move LPC code from flacenc.c to new lpc.[ch] files.
Originally committed as revision 14790 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 17:18:20 +00:00
Loren Merritt
ebceaa1cd5 gcc chokes on the 7 registers needed for float_to_int16_interleave6 (even inside HAVE_7REGS), so write it in yasm
Originally committed as revision 14749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 04:40:46 +00:00
Ramiro Polla
ce15710f55 mlp: Split common code from parser and decoder to be used by encoder.
Originally committed as revision 14733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 18:47:03 +00:00
Loren Merritt
49c0dd754c indent
Originally committed as revision 14699 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 00:27:21 +00:00
Loren Merritt
5d0ddd1a9f split-radix FFT
c is 1.9x faster than previous c (on various x86 cpus), sse is 1.6x faster than previous sse.

Originally committed as revision 14698 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 00:26:58 +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
Gregory Montoir
974e0eeed3 Motion Pixels Video Decoder.
Patch by Gregory Montoir <cyx <at> users <dot> sourceforge <dot> net>

Originally committed as revision 14146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-10 03:01:39 +00:00
Peter Ross
495900f78b Electronic Arts CMV decoder
Originally committed as revision 14110 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-08 13:22:23 +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
Vitor Sessak
95fc77b92d Use ff_acelp_lp_synthesis_filter() instead of duplicating it
Originally committed as revision 14029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-29 11:21:06 +00:00
Michael Niedermayer
0c587a4ea8 VP3 & Theora parser to extract keyframe flags.
This parser is not able to split random bitstream pieces.

Originally committed as revision 13986 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 11:25:42 +00:00
Diego Biurrun
d43cf68898 cosmetics: alignment
Originally committed as revision 13886 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 13:01:24 +00:00
Diego Biurrun
4e882caf51 Add missing entry for PCM_DVD_ENCODER.
Originally committed as revision 13885 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 12:56:30 +00:00
Peter Ross
4198efe83f Add missing mpegvideo.o to list of vc1.o dependencies.
patch by Peter Ross, pross xvid org

Originally committed as revision 13884 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 12:52:26 +00:00
Peter Ross
c183033f77 Add missing entry for ADPCM_IMA_QT_ENCODER.
patch by Peter Ross, pross xvid org

Originally committed as revision 13883 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 12:48:39 +00:00
Peter Ross
cc6c2befa9 Add missing entry for ADPCM_EA_MAXIS_XA_DECODER.
patch by Peter Ross, pross xvid org

Originally committed as revision 13882 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 12:47:39 +00:00
Justin Ruggles
7ed9a2ea50 add ac3dec_data.[c,h]
Originally committed as revision 13715 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-08 21:08:57 +00:00
Bartlomiej Wolowiec
681f5c1271 Separating from nellymoserdec.c parts required by encoder
Originally committed as revision 13713 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-08 20:45:18 +00:00
Diego Biurrun
969f949300 Remove Fabrice's copyright from the Makefiles. They have been entirely
rewritten since they were originally created.

Originally committed as revision 13675 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-06 17:50:32 +00:00
Vitor Sessak
9d283aee83 Remove ra144.o dependency added in revision r13500, now reverted
Originally committed as revision 13575 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-31 14:32:11 +00:00
Vitor Sessak
31e15894d5 Use ff_acelp_weighted_vector_sum() instead of reimplementing it
Originally committed as revision 13500 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-28 19:04:34 +00:00
Lars Täuber
1472b7dd28 LPCM 24 bits support, patch by Lars Täuber, lars.taeuber gmx net
Originally committed as revision 13187 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-17 11:42:03 +00:00
Guillaume Poirier
d9481eb7f3 armv4l/float_arm_vfp.o must be added to OBJS-$(HAVE_ARMVFP) list since
it's build out of a C file, not an ASM file

Originally committed as revision 13134 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-12 09:18:32 +00:00
Siarhei Siamashka
e6303192c7 Add some initial optimizations for ARM VFP (floating
point coprocessor available in some ARM11 cores).
Patch by Siarhei Siamashka % siarhei.siamashka@gmail.com %
Original thread:
date: Apr 20, 2008 5:41 PM
subject: [FFmpeg-devel] [PATCH] Some ARM VFP optimizations (vector_fmul, vector_fmul_reverse, float_to_int16)

Originally committed as revision 13128 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-11 20:06:03 +00:00
Anuradha Suraparaju
f7cd9eed5d Add Dirac support through libschroedinger.
patch by Anuradha Suraparaju, anuradha rd.bbc.co uk

Originally committed as revision 13046 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-03 13:59:45 +00:00
Anuradha Suraparaju
690bfceb20 Dirac decoding/encoding support via libdirac.
patch by Anuradha Suraparaju, anuradha rd.bbc.co uk

Originally committed as revision 13042 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-03 03:47:26 +00:00
Diego Biurrun
575e696ce4 Add Dirac parser from SoC; written by Marco Gerards;
submitted by Anuradha Suraparaju, anuradha rd.bbc.co uk

Originally committed as revision 13041 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-03 03:33:21 +00:00
Diego Biurrun
57105ddd03 Rename i386/cputest.c --> i386/cpuid.c.
Originally committed as revision 13002 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 16:02:22 +00:00
Diego Biurrun
8033ba57b9 Remove unnecessary test program dependency declarations.
Originally committed as revision 13001 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 15:38:00 +00:00
Baptiste Coudurier
9a53eb7ce7 mp3on4 decoder now depends on mpeg4audio code
Originally committed as revision 12989 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 14:00:27 +00:00
Baptiste Coudurier
bf52a72023 10l, alphabetical order
Originally committed as revision 12973 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 16:54:53 +00:00
Baptiste Coudurier
45a97d3018 set channels and sample rate from mpeg4audio config
Originally committed as revision 12964 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 14:09:42 +00:00
Baptiste Coudurier
4afaffca9e mov demuxer depends on mpeg4audio code now
Originally committed as revision 12963 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 14:05:32 +00:00
Diego Biurrun
12eef728bf Fix build of cputest test program.
Originally committed as revision 12899 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-19 09:18:25 +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
Diego Biurrun
0ddfbc73cc cosmetics: Sort some lists alphabetically.
Originally committed as revision 12886 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-17 22:04:34 +00:00
Måns Rullgård
b153c68b8a fix building of test programs (make tests)
Originally committed as revision 12867 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-16 21:50:41 +00:00
Alexander Strange
f73a6393e7 Add a new xvid-style IDCT using SSE2.
Originally committed as revision 12843 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-16 01:36:14 +00:00
Diego Biurrun
e825656f1d Clear DIRS variable in common.mak, so it does not have to be cleared in
each subdirectory Makefile.

Originally committed as revision 12803 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 10:37:30 +00:00
Diego Biurrun
7b1b3dc128 Unset DIRS after including subdir.mak so that the variable is not used
in the other subdirectory Makefiles.

Originally committed as revision 12801 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 10:22:46 +00:00
Diego Biurrun
adc393503f Generate the list of files to clean in subdirectories in common.mak.
This way, it can be used from all directories.

Originally committed as revision 12800 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 10:09:47 +00:00
Diego Biurrun
77405bb879 Simplify CLEANFILES generation.
Originally committed as revision 12798 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 09:44:42 +00:00
Måns Rullgård
8e255b8bda replace some ifeq with prettier ifdef
Originally committed as revision 12764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-07 22:17:47 +00:00
Måns Rullgård
dbe6c6ff00 append TESTS-yes to TESTS; one ifeq less
Originally committed as revision 12763 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-07 22:17:44 +00:00
Måns Rullgård
71c61f62a3 non-recursive makefiles
Originally committed as revision 12760 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-07 21:16:31 +00:00
Aurelien Jacobs
7bfacd4e75 use common aac sample rate tables
Originally committed as revision 12671 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-02 21:41:48 +00:00
Baptiste Coudurier
bac47ae6ca use mpeg4audio common code in aac parser
Originally committed as revision 12665 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-01 12:50:32 +00:00
Diego Biurrun
dd9c773bd9 Make XVMC compilation depend on HAVE_XVMC, not HAVE_XVMC_ACCEL.
Originally committed as revision 12654 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-31 17:12:10 +00:00
Eli Friedman
40d2627306 Escape 124 (RPL) decoder
Patch by Eli Friedman (eli friedman gmail com)

Originally committed as revision 12648 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-31 10:41:40 +00:00
Jai Menon
cb21e0a715 8SVX decoder
Patch by Jai Menon (realityman <at> gmx.net)

Originally committed as revision 12632 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-30 19:16:08 +00:00
Diego Biurrun
a815037409 Classify mlib as a configurable option, not as a hardware feature.
Originally committed as revision 12589 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-25 21:30:16 +00:00
Sascha Sommer
975cdc8fc1 rl2 decoder
Originally committed as revision 12543 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 13:45:55 +00:00
Ramiro Polla
a7129de51b Mimic decoder.
Originally committed as revision 12491 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-18 19:51:34 +00:00
Måns Rullgård
d85d7a0be7 mpegvideo_armv5te.o belongs to OBJS, not ASM_OBJS
Originally committed as revision 12467 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-17 02:33:08 +00:00
Diego Biurrun
13ca50f367 Rename --enable-swscaler --> enable-swscale to be consistent with the
directory name and other option names. Also rename variables accordingly.

Originally committed as revision 12408 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 17:54:24 +00:00
Diego Biurrun
9b25f4a65f cosmetics: Consistently move NAME and FFLIBS to the top of each Makefile.
Originally committed as revision 12364 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 14:39:43 +00:00
Måns Rullgård
0e32c8c65a simplify library version handling
Originally committed as revision 12362 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-07 19:27:17 +00:00
Måns Rullgård
5671fc14f6 consolidate CFLAGS, LDFLAGS, EXTRALIBS assignment
Originally committed as revision 12354 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 20:44:44 +00:00
Aurelien Jacobs
9822564d1d make compilation of mpeg12* and mpegvideo conditional
Originally committed as revision 12345 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 21:43:30 +00:00
Aurelien Jacobs
5a4334618c add dependencies for matroska audio and nut muxers over lavc
Originally committed as revision 12339 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 16:34:47 +00:00
Aurelien Jacobs
591bf9b942 add some required objects dependencies
Originally committed as revision 12333 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 14:49:43 +00:00
Aurelien Jacobs
7998988129 fix wmv3 dependencies
Originally committed as revision 12314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-04 18:38:32 +00:00
Michael Niedermayer
6f08c541b4 floating point AAN IDCT
Originally committed as revision 12233 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 14:59:11 +00:00
Aurelien Jacobs
97d1d009e2 split encoding part of dsputil_mmx into its own file
Originally committed as revision 12223 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 23:14:22 +00:00
Aurelien Jacobs
57b98634c4 compile various fdct only when encoders are enabled
Originally committed as revision 12219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 21:43:19 +00:00
Reimar Döffinger
234c6ed76d Add bitstream filter to convert between mov and plain text subtitles
Originally committed as revision 11659 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 21:24:09 +00:00
Diego Biurrun
bca9e0bcf1 Move common test program infrastructure to common.mak.
Originally committed as revision 11645 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-27 23:28:56 +00:00
Diego Biurrun
fe34942e92 Move some lines in preparation for an upcoming commit.
Originally committed as revision 11644 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-27 23:27:13 +00:00
Diego Biurrun
eba6ba4a74 Add $(EXESUF) where necessary.
Originally committed as revision 11636 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-27 17:50:59 +00:00
Diego Biurrun
1260eb4a68 whitespace and sorting cosmetics
Originally committed as revision 11632 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-27 14:52:58 +00:00
Diego Biurrun
f98869bcec Add generic rule for all tests.
Originally committed as revision 11631 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-27 14:50:29 +00:00
Diego Biurrun
64e13d6914 Do not group libamr_nb and libamr_wb together as libamr.
Also fixes --enable-libamr being recognized as configure parameter.

Originally committed as revision 11616 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 12:46:46 +00:00
Aurelien Jacobs
1ace441909 add proper matroskaenc dependency over xiph.o
Originally committed as revision 11580 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-20 21:38:21 +00:00
Aurelien Jacobs
22cf0018d4 add missing Makefile rules for zork pcm encoder/decoder
Originally committed as revision 11578 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-20 20:55:28 +00:00
Aurelien Jacobs
8dcbcef68e and thus, nellymoser obviously also depens on fft.o
Originally committed as revision 11577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-20 20:51:19 +00:00
Aurelien Jacobs
d1c266bed1 nellymoser uses mdct functions
Originally committed as revision 11576 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-20 20:45:43 +00:00
Ivo van Poorten
3c808d8cc4 Sort properly
Originally committed as revision 11343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-28 13:09:57 +00:00
Ivo van Poorten
d43df959d7 Sun Rasterfile decoder
Originally committed as revision 11342 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-28 13:07:43 +00:00
Ivo van Poorten
b4abe1d198 PC Paintbrush PCX image decoder
Originally committed as revision 11321 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-26 22:17:46 +00:00
Diego Biurrun
379374ea11 cosmetics: Sort some more entries.
Originally committed as revision 11265 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-19 08:14:21 +00:00
Aurelien Jacobs
407c50a024 move FLAC mmx dsp to its own file
Originally committed as revision 11244 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-16 22:20:47 +00:00
Ian Caulfield
6b493b2f2f MLP/TrueHD parser
Patch by Ian Caulfield, ian D caulfield <at> gmail D com
Thread: [PATCH] MLP/TrueHD decoder, 12 Oct 14:26

Originally committed as revision 11109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-28 14:27:53 +00:00
Aurelien Jacobs
5b67ce2afa build vc1dsp_mmx.c in its own compilation unit
Originally committed as revision 11102 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-27 22:42:55 +00:00
Aurelien Jacobs
725d86bfd5 add pcm_s16le_planar support for electronicarts files
Originally committed as revision 11092 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-25 16:32:47 +00:00
Aurelien Jacobs
4d4f59d750 split wmv2 encoder and decoder in their own files
Originally committed as revision 11091 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-25 16:23:42 +00:00
Diego Biurrun
1b04f3e065 cosmetics: Keep all OBJS entries on a line of their own.
Originally committed as revision 11005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-12 22:29:37 +00:00
Baptiste Coudurier
5118cae694 ogg muxer
Originally committed as revision 10999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-10 18:27:03 +00:00
Michael Niedermayer
9abc7e0fdc intrax8 decoder patch by "someone"
Originally committed as revision 10971 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-09 21:37:48 +00:00
Aurelien Jacobs
cc6de104f8 split wmv2 in its own file
Originally committed as revision 10951 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-07 23:41:39 +00:00
Kostya Shishkov
12877faf7c Musepack SV8 demuxer and decoder
Originally committed as revision 10938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-07 05:35:46 +00:00
Aurelien Jacobs
271b4095ad add Electronic Arts XAS ADPCM decoder
based on a patch from Peter Ross

Originally committed as revision 10913 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-03 22:37:18 +00:00
Kostya Shishkov
24e649afe3 Split Musepack decoder into SV7 decoder and synth core
(for upcoming SV8 decoder)

Originally committed as revision 10905 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-02 06:40:42 +00:00
Aurelien Jacobs
76c443c6d4 move adx.c to adxdec.c
Originally committed as revision 10904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-01 18:40:42 +00:00
Aurelien Jacobs
c31dea6136 split adx encoder in its own file
Originally committed as revision 10903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-01 18:38:15 +00:00
Aurelien Jacobs
f6e2300fe7 don't register adpcm encoders which are not implemented
Originally committed as revision 10894 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-01 15:51:51 +00:00
Peter Ross
fac84d3c18 EA IMA EACS decoder
original patch by Peter Ross

Originally committed as revision 10880 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-30 23:20:26 +00:00
Peter Ross
7bb65d8964 EA IMA SEAD decoder
original patch by Peter Ross

Originally committed as revision 10879 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-30 23:12:18 +00:00
Peter Ross
e758396268 EA ADPCM R1, R2 and R3 decoder
original patch by Peter Ross

Originally committed as revision 10856 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-24 20:49:42 +00:00
Kostya Shishkov
66f7679c62 Beam Software SIFF demuxer and video decoder
Originally committed as revision 10833 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-22 06:01:38 +00:00
Diego Biurrun
24743a767f Rename LIB to LIBNAME for consistency.
Originally committed as revision 10774 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 09:34:49 +00:00
Benjamin Larsson
636b13c5fc Nellymoser ASAO decoder
Originally committed as revision 10741 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-15 16:26:02 +00:00