Commit Graph

4238 Commits

Author SHA1 Message Date
Benjamin Larsson 162b983598 av_log(NULL,... -> av_log(avctx,.. where appropriate.
Originally committed as revision 7319 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-14 17:58:25 +00:00
Benjamin Larsson e7a6d5f313 Bug fix for crashes when SSE is used on unaligned arrays.
No measureable change in speed. This gave random crashes on Win32
and BeOS. The cause for this bug is that gcc doesn't align the
stackframe. Linux and glibc always ensure this to be true thus
this never affected Linux.

Originally committed as revision 7318 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-14 17:50:23 +00:00
Diego Biurrun f70d367b63 vqmin/vqmax --> qmin/qmax in the option description
Originally committed as revision 7316 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 11:10:41 +00:00
Guillaume Poirier e828d257e7 Doxygen comments about variables described by Michael here:
Date: Tue, 12 Dec 2006 14:00:54 +0100
Subject: Re: [Ffmpeg-cvslog] r6876 - trunk/libavcodec/motion_est.c

Originally committed as revision 7288 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 13:41:17 +00:00
Michael Niedermayer 2b0cdd9ec6 mv overflow in map fix (untested except regression tests)
Originally committed as revision 7287 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 13:31:12 +00:00
Reimar Döffinger c8aee695c5 Fix JPEG-LS encoder 0xff-escaping writing too much or uninitialized data.
Originally committed as revision 7284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-11 20:18:36 +00:00
Panagiotis Issaris c6b237da9e Adding H.264 DCT.
Originally committed as revision 7282 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-11 15:53:55 +00:00
Michael Niedermayer 2f5560ee49 fix playback of mp3_bits_left.avi
Originally committed as revision 7279 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-11 13:01:20 +00:00
Guillaume Poirier ec4e0056ef GCC 3.3 compile fix
Originally committed as revision 7277 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-11 10:52:18 +00:00
Diego Biurrun 895bf49961 Improve option description.
Originally committed as revision 7276 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-11 10:51:42 +00:00
Måns Rullgård c1173617ce improved stack misalignment warning
Originally committed as revision 7275 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-11 09:19:58 +00:00
Panagiotis Issaris e39e60a37e Adding function which enables writing H.264 NAL units.
Originally committed as revision 7273 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-11 01:00:50 +00:00
Reimar Döffinger 46f9dcc3ee Fix 16 bit cscd samples, 16 bit raw means RGB555 on Windows, and the original
cscd codec is for windows.

Originally committed as revision 7266 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-09 13:30:28 +00:00
Reimar Döffinger 2c04fc1f8c Typo in error message
Originally committed as revision 7265 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-09 13:13:45 +00:00
Martin Storsjö 4027ed1d06 fix bug when __GNUC__ isn't defined and when compiling for a non-x86 architecture, patch by Martin Storsjö, martin at martin st
Originally committed as revision 7261 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-08 13:25:37 +00:00
Kostya Shishkov a4b940198a Deobfuscate expression
Originally committed as revision 7260 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-08 05:28:00 +00:00
Kostya Shishkov 3dd52c5afe Now ZMBV encoder compiles
Originally committed as revision 7259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-08 05:13:40 +00:00
Kostya Shishkov 766937298e 1e6l forgot to add zmbvenc.c
Originally committed as revision 7258 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-08 04:37:00 +00:00
Måns Rullgård c97dc988ba lavc is at major version 51, delete old stuff
Originally committed as revision 7257 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-08 00:42:55 +00:00
Måns Rullgård 849f10351d rename always_inline to av_always_inline and move to common.h
Originally committed as revision 7256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-08 00:35:08 +00:00
Michael Niedermayer 6c81ca9906 better warning
Originally committed as revision 7250 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-07 18:35:58 +00:00
Michael Niedermayer 6dc7d5da70 ff_check_alignment to warn the user about a missaligned stack
Originally committed as revision 7249 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-07 18:33:00 +00:00
Michael Niedermayer f95778f80d fix compilation
Originally committed as revision 7248 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-07 18:29:02 +00:00
Panagiotis Issaris f1862127f5 Added entry for H.264 DCT to the DSP context.
Originally committed as revision 7247 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-07 16:09:33 +00:00
Panagiotis Issaris 3edeab8209 Add codec ID for a native H.264 encoder.
Originally committed as revision 7246 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-07 15:59:42 +00:00
Panagiotis Issaris acd8d10ffb Making rem6 and div6 globally visible and thus adding prefixes.
Originally committed as revision 7245 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-07 09:59:05 +00:00
Panagiotis Issaris 14e95e2c92 Removing unused code
Originally committed as revision 7244 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-07 09:47:29 +00:00
Kostya Shishkov f48d6e1b44 ZMBV encoder
Originally committed as revision 7242 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-07 04:17:01 +00:00
Måns Rullgård 8da9266cea use the standard INT64_C() macro for 64-bit constants
Originally committed as revision 7240 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 23:46:11 +00:00
Panagiotis Issaris d3075ed502 Add "mixed_refs" description suggested by Loren Merritt and update accompanying
comment in the code.

Originally committed as revision 7235 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 17:04:23 +00:00
Panagiotis Issaris 119aae1dd5 Add more descriptions to the AVOption array taken from the avcodec.h AVCodec structure member comments.
Originally committed as revision 7233 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 08:24:29 +00:00
Panagiotis Issaris a074f143dd Export symbols of several H.264 intra prediction functions
Originally committed as revision 7232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 08:17:43 +00:00
Alexander Chemeris a083f53c45 fix crash when decoding a truncated H264 slice
patch by Alexander Chemeris % ipse P ffmpeg A gmail.com %
Original thread:
date: Dec 5, 2006 7:26 PM
subject: [Ffmpeg-devel] [PATCH] Fix crush when truncated slice passed to H.264 decoder

Originally committed as revision 7229 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-05 22:18:19 +00:00
Panagiotis Issaris 3ee5c5b739 Removing unused code
Originally committed as revision 7228 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-05 22:05:09 +00:00
Panagiotis Issaris ea9f5d6f76 Add comment denoting group of H.264 functions
Originally committed as revision 7227 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-05 21:57:31 +00:00
Panagiotis Issaris 550e66cb59 Change NAL unit type defines to an enum and move to a header file for usage
in other code.

Originally committed as revision 7226 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-05 21:52:15 +00:00
Michael Niedermayer 2421a01b25 10l umh search needs hex size 2 now after the last change
Originally committed as revision 7224 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-05 12:35:47 +00:00
Michael Niedermayer f852ff3257 make hex and large 2 small diamond search half their size instead or -1 if the initial size was a power of 2
double the hex size so odd sized hexagons are possible

Originally committed as revision 7223 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-05 12:34:52 +00:00
Diego Biurrun 4a1bb6196b Fix some obvious mistakes in the option descriptions.
Originally committed as revision 7220 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-04 12:04:53 +00:00
Reimar Döffinger cf1e119bb2 Move BE_*/LE_*/ST*/LD* macros to a common place. Some further
optimization/cleanup would be desirable (e.g. LE_* and LD*
should be the same on x86).

Originally committed as revision 7218 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-03 16:35:30 +00:00
Mike Melanson 10f865c9b7 Another hack to allow the Cinepak decoder to detect both types of deviant Cinepak
data. Tested against both known FILM files, several CPK files, and normal
CVID-encoded files.

Originally committed as revision 7215 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-02 22:27:18 +00:00
Víctor Paesa 970419236d Fill in some missing AVOption descriptions.
patch by Víctor Paesa, wzrlpy arsystel com

Originally committed as revision 7213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-02 18:58:20 +00:00
Guillaume Poirier 3813dcc9bf Add IDCT8 routine in Altivec. Patch by yours truely with Linux fixes by Luca Barbato
Originally committed as revision 7210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-02 14:50:42 +00:00
Diego Biurrun c6c367254f spelling cosmetics: cliped --> clipped
Originally committed as revision 7208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-02 14:19:49 +00:00
Kostya Shishkov 08baa3e0d7 10e6l FastUVMC was done right but in the wrong place
Originally committed as revision 7207 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-02 12:55:29 +00:00
Michael Niedermayer 516ea8d222 fix indention
Originally committed as revision 7206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-02 11:24:41 +00:00
Michael Niedermayer 1994e7c6b6 dia_size=-1 -> funny_diamond_search()
dia_siue=768 + size -> umh search (old -1 was 784)

Originally committed as revision 7205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-02 10:58:20 +00:00
Michael Niedermayer 376edfcc0f hexagon search
dia_size=512 + hexagon size (513 is the normal one used in h264)
large to small diamond search
        dia_size=256 + diamond size

Originally committed as revision 7204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-02 10:45:51 +00:00
Luca Barbato 4b47d258f6 Unused variable removed
Originally committed as revision 7203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-02 01:28:21 +00:00
Michael Niedermayer ed1dfc4970 remove pretty much useless skiping of some predictors
this has pretty much no quality or speed effect except very small random changes

Originally committed as revision 7202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-01 20:38:54 +00:00
Baptiste Coudurier 1a1c53856f mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
Originally committed as revision 7201 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-01 14:06:21 +00:00
Baptiste Coudurier e68e5ab0cf add bytestream big endian 16/32 writing functions
Originally committed as revision 7200 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-01 14:01:50 +00:00
Michael Niedermayer c9cac6e3d7 typo in umh
Originally committed as revision 7193 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-01 09:58:06 +00:00
Michael Niedermayer c7675718e4 UMH support (dia_size=-1 activates it)
Originally committed as revision 7192 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-01 09:48:33 +00:00
Michael Niedermayer ac003d2461 cosmetic (prevent name clashes of variables in a macro with surrounding code)
Originally committed as revision 7191 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-01 09:46:52 +00:00
Kostya Shishkov 98ba1cfaf7 100l FastUVMC rounding was incorrect.
This should also improve quality on WMV9Drifting.asf

Originally committed as revision 7190 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-01 07:24:56 +00:00
Michael Niedermayer f7f8af46f7 1 step diamond search around the median MV predictor
+0.01 PSNR
idea from x264

Originally committed as revision 7189 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-30 22:44:22 +00:00
Kostya Shishkov 7667896a36 VQA v1 support
Originally committed as revision 7183 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-29 05:40:37 +00:00
Aurelien Jacobs f39020269e cleanup the #ifdef mess in encoder/decoder/parser registration
Originally committed as revision 7182 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-28 23:55:24 +00:00
Kostya Shishkov 7504e4fa1d Correct information in header
Originally committed as revision 7178 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-28 05:34:28 +00:00
Robert Swain c411e7f6fb alphabetic reordering of codec registration
patch by Robert Swain < robert.swain _at_ gmail.com >

Originally committed as revision 7176 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-27 13:04:56 +00:00
Michael Niedermayer c61b9d4473 PIC fix
Originally committed as revision 7173 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-27 10:56:10 +00:00
Brian Foley 49cef7443a Move copy_block* functions to dsp dsputil.h
Patch by Brian Foley % bfoley A compsoc P nuigalway P ie %
Original thread:
Date: Nov 26, 2006 6:44 PM
Subject: Re: [Ffmpeg-devel] [PATCH] put_mpeg4_qpel16_h_lowpass altivec, take 2

Originally committed as revision 7172 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-26 18:25:07 +00:00
Kostya Shishkov 61f5b14a8e Correct rounding values in overlap filtering
Originally committed as revision 7171 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-26 04:57:31 +00:00
Kostya Shishkov 5081f3aad5 B-frames support for adv. profile
Originally committed as revision 7170 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-26 04:54:17 +00:00
Kostya Shishkov b8ce8f15a0 100l: Initialize dc_scale with current quantizer for adv I frames
Originally committed as revision 7169 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-26 04:53:36 +00:00
Kostya Shishkov 25e9c7efa5 Use halfpq in coefficient scaling
Originally committed as revision 7168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-26 04:52:36 +00:00
Luca Barbato c61e1098e7 typo
Originally committed as revision 7166 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-24 12:36:06 +00:00
Steven Johnson fce2200da0 Implement DELTA_FLI opcodes correctly. Patch by Steven Johnson
Originally committed as revision 7165 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-24 00:16:32 +00:00
Alex Beregszaszi 37e6f5f321 support byte_run=0 case in DELTA_FLI (this case means only skip pixels)
Originally committed as revision 7164 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-23 23:50:08 +00:00
Alex Beregszaszi fe99025b16 10l memory corruption bug found by Steven Johnson
Originally committed as revision 7163 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-23 22:57:20 +00:00
Aurelien Jacobs 17c90b9d62 flac: allow reading of full metadata headers from extradata
Originally committed as revision 7161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-23 22:22:03 +00:00
Bill O'Shaughnessy 3e954443dd bring AC3 encoder output up to input volume level
patch by Bill O'Shaughnessy % bill P oshaughnessy A gmail.com %
+ reg tests update gruntwork by me
Original thread:
date: Nov 21, 2006 11:36 PM
subject: [Ffmpeg-devel] Simpler Patch to bring AC3 encoder output up to input level

Originally committed as revision 7160 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-23 22:21:01 +00:00
Baptiste Coudurier 3c1418175d fix bitstream to be correctly decoded by quicktime
Originally committed as revision 7157 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-22 13:53:22 +00:00
Baptiste Coudurier f856756059 fix sigfpe with intra only encoding
Originally committed as revision 7156 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-22 13:24:58 +00:00
Diego Biurrun 8cff89be43 Conditionally compile some of the AltiVec optimizations.
Originally committed as revision 7154 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-22 09:20:16 +00:00
Matthias Hopf 1e25a7e7eb fix some potential security issues, patch by Matthias Hopf, mat at mshopf dot de
Originally committed as revision 7153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-22 01:11:29 +00:00
Diego Biurrun 248bc6bb8c Fix compilation with VC-1 decoder disabled.
Originally committed as revision 7149 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-21 21:18:55 +00:00
Michael Niedermayer bb243e7100 fix b frames + -mbd rd without -psnr (yes that was seriously buggy and probably hasnt been noticed as everyone who tested stuff used -psnr)
Originally committed as revision 7148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-21 19:37:44 +00:00
Michael Niedermayer 169bc475d1 100l infinite loop fix
Originally committed as revision 7147 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-21 19:35:06 +00:00
Kostya Shishkov 426b11a833 Decode non-interleaved scans
Originally committed as revision 7143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-21 06:15:18 +00:00
Guillaume Poirier 8db4f43c68 Fix declaration and code thingie
Originally committed as revision 7140 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-20 20:41:31 +00:00
Martin 4ec0ccb1a4 allow amr bitrate to be changed "on the fly" through avctx->bitrate.
Patch by Martin % marthi A graphics P cs P uni - sb P de %
Original thread:
date: Nov 20, 2006 6:20 PM
subject: Re: [Ffmpeg-devel] [PATCH] Re: AMR bitrate

Originally committed as revision 7139 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-20 20:35:47 +00:00
Tom Harper 9f83e1427a Fix linking with H.261 support disabled.
patch by Tom Harper, d.thomas.harper gmail com

Originally committed as revision 7134 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-20 14:13:32 +00:00
Michael Niedermayer ec9ed85dc7 infiinit loop fix for CBR + adaptive quant
Originally committed as revision 7133 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-20 11:53:02 +00:00
Michael Niedermayer 789382d340 100l qprd fix 2nd try
Originally committed as revision 7132 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-20 10:48:23 +00:00
Kostya Shishkov 6ffdc53de9 Some progressive JPEG support
Originally committed as revision 7131 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-20 05:21:17 +00:00
Michael Niedermayer 3f9fea7230 testing all dquant for qp_rd fixes the qp runaway to 31 bug
Originally committed as revision 7126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-19 23:19:52 +00:00
Guillaume Poirier 00f636a04f Add useful Altivec types, taken from with permission from x264 authors
Originally committed as revision 7125 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-19 22:51:54 +00:00
Kostya Shishkov c8f9f9b91a Divide first audio buffer chunk into atomary bufffers.
This slightly simplifies decoder and removes potential
audio buffer overrun.

Originally committed as revision 7121 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-19 05:30:43 +00:00
Benjamin Larsson 3644d47241 Missed one log2().
Originally committed as revision 7117 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-17 21:43:46 +00:00
Kostya Shishkov b615c1edfc Optimize overlapping
Suggested by Skal, sprintf(mail, "skal%d@orange.fr", 0xFFFF)

Originally committed as revision 7113 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-17 06:12:33 +00:00
Kostya Shishkov 7ad8d3bf0c Fix comments
Originally committed as revision 7112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-17 06:10:52 +00:00
Kostya Shishkov b6fa8993fb Overlap filtering was done in reverse order
Originally committed as revision 7111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-17 06:09:32 +00:00
Alex Beregszaszi 20d46c038a Remove alpha channel from RGB555
Originally committed as revision 7106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-16 20:46:36 +00:00
Alex Beregszaszi 08d23410ea BGR555 has never been working as alpha supporting format. Remove the false setting.
Originally committed as revision 7105 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-16 20:43:29 +00:00
Baptiste Coudurier a57d13b713 throw error if unsupported resolution is used with h261
Originally committed as revision 7097 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-16 09:58:34 +00:00
Michael Niedermayer 8e5606bfcd detect a few more errors (fixes libmp3-bug.avi again)
make pickyness of the decoder user selectable through error_resilience param like for video decoders

Originally committed as revision 7089 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-15 17:58:35 +00:00
Michael Niedermayer ee50a7c1e5 making decoding more error robust
Originally committed as revision 7073 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 22:06:28 +00:00
Michael Niedermayer 9bb328d397 reset internal buffer during seeking
Originally committed as revision 7070 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 20:39:20 +00:00