virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
28,913 Commits 37 Branches 400 Tags 465 MiB
bc6047223f
Commit Graph

710 Commits

Author SHA1 Message Date
Michael Niedermayer
acff54d831 10l 
Originally committed as revision 7351 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-12-21 22:35:13 +00:00
Michael Niedermayer
5970845f1f FIXME has already been fixed ages ago 
Originally committed as revision 7348 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-12-21 15:49:40 +00:00
Michael Niedermayer
66884a2946 simplify 
Originally committed as revision 7347 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-12-21 15:46:32 +00:00
Michael Niedermayer
d6975eb82b use qscale_table in adaptive quant 
some PSNR/bitrate improvement for adaptive quant

Originally committed as revision 7346 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-12-21 15:45:53 +00:00
Michael Niedermayer
2f16af0667 skip motion estimation and encoding of non direct-0,0 MBs if the next MB is skiped (mpeg4 doesnt allow such MBs and in the past we did ME and encoding until at the end we droped them, so this should be faster though i didnt benchmark it, benchmark welcome) 
Originally committed as revision 7343 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-12-21 15:20:02 +00:00
Michael Niedermayer
cb284d4b77 try direct mode MB after QPRD, slight PSNR/bitrate gain if b frames + QPRD 
Originally committed as revision 7336 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-12-20 23:43:13 +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
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
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
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
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
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
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
Baptiste Coudurier
9cc6be9d27 add low delay forcing option for mpeg1/2 encoding 
Originally committed as revision 7008 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-13 11:30:26 +00:00
Måns Rullgård
1d50395746 rename squareTbl -> ff_squareTbl 
Originally committed as revision 6995 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-12 21:48:04 +00:00
Baptiste Coudurier
1766295516 add codec_tag and codec_stream_tag to MpegEncContext to not alter avctx values 
Originally committed as revision 6930 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-07 09:46:57 +00:00
Steve L'Homme
949b1a13bf Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts. 
patch by Steve Lhomme, slhomme divxcorp com

Originally committed as revision 6868 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-01 22:39:58 +00:00
Michael Niedermayer
45f3704c6d 10l (forgot ALT_SCAN) 
Originally committed as revision 6866 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-01 21:41:54 +00:00
Diego Biurrun
1345f4ed6c Rename SWAP macro to FFSWAP. 
Originally committed as revision 6865 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-01 21:28:36 +00:00
Michael Niedermayer
7aba918708 fix 1/0 b frames + CBR bug 
Originally committed as revision 6850 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-31 22:22:11 +00:00
Michael Niedermayer
1928d04640 prevent overflow if lambda2 is "too" large 
Originally committed as revision 6823 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-28 15:20:00 +00:00
Michael Niedermayer
ea7307df20 use lambda/lmax instead of qscale/qmax as end check for vbv retry 
Originally committed as revision 6822 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-28 11:15:06 +00:00
Michael Niedermayer
5dc4970661 prevent infinite loop 
Originally committed as revision 6753 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-21 22:07:01 +00:00
Diego Biurrun
c26abfa541 Rename ABS macro to FFABS. 
Originally committed as revision 6666 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-11 23:17:58 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library' 
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-07 15:30:46 +00:00
Michael Niedermayer
075060023d fix buffer underflows by reencoding the current frame with a higher QP 
Originally committed as revision 6565 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-05 19:27:18 +00:00
Baptiste Coudurier
2bb7875987 mjpeg 4:2:2 encoding support 
Originally committed as revision 6550 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-04 12:49:52 +00:00
Loren Merritt
2833fc4646 approximate qpel functions: sacrifice some quality for some decoding speed. enabled on B-frames with -lavdopts fast. 
Originally committed as revision 6412 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-01 21:25:17 +00:00
Måns Rullgård
bca99b47bf return 0 from encode_picture() and estimate_qp() on success 
Originally committed as revision 6363 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-27 22:12:08 +00:00
Måns Rullgård
62bb489b13 add some #ifdef CONFIG_ENCODERS/DECODERS 
Originally committed as revision 6356 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-27 19:54:07 +00:00
Måns Rullgård
191e8ca752 fix some signedness warnings 
Originally committed as revision 6355 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-27 19:47:39 +00:00
Panagiotis Issaris
4156a436e3 Handle possible failure of ff_eval. 
Originally committed as revision 6338 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-26 14:04:36 +00:00
Michael Niedermayer
67eca72dc0 SWAP 
Originally committed as revision 6030 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-19 20:55:02 +00:00
Diego Biurrun
f4bd289a04 Explicitly include fastmemcpy.h from libvo/. 
Originally committed as revision 6021 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-18 13:38:24 +00:00
Michael Niedermayer
a7702890bd remove STATS code (probably hasnt been used for years ..., and its not completely clear what it was good for anyway) 
Originally committed as revision 5689 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-09 10:33:49 +00:00
Corey Hickey
f9243d34f1 Make B-frame reduction sensitivity by b_strategy/vb_strategy = 1 
user-tunable.

Originally committed as revision 5450 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-03 06:26:04 +00:00
Corey Hickey
b29183a150 Make b_frame_strategy not fail on pass 2, but still print a notice. 
Originally committed as revision 5425 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-05-29 22:44:16 +00:00
Loren Merritt
5d18eaad13 h264: MBAFF interlaced decoding 
Originally committed as revision 5419 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-05-28 22:44:14 +00:00
Baptiste Coudurier
2d974017b0 MPEG-2 4:2:2 encoding support 
Originally committed as revision 5387 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-05-16 15:19:54 +00:00
Baptiste Coudurier
307eb24879 add MPEG-2 intra vlc support 
Originally committed as revision 5372 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-05-13 17:16:58 +00:00
Michael Niedermayer
d4277a7d51 allow insane gop sizes if the user doesnt care about playable streams (doesnt want compliance to any standard) 
Originally committed as revision 5351 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-05-09 08:40:38 +00:00
Aurelien Jacobs
c51ba67a98 clip_uint8 now return an uint8_t so no need to &0xFF 
Originally committed as revision 5339 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-05-01 00:28:36 +00:00
Michael Niedermayer
e27b6e62f7 missmatch control for mpeg2 intra dequantization if bitexact=1 
Originally committed as revision 5328 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-04-28 17:03:52 +00:00
Loren Merritt
c6f9e821c3 10l in h264 vismb/vismv (broke on 2006-03-09) 
Originally committed as revision 5309 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-04-21 19:22:14 +00:00
Michael Niedermayer
54009d4295 remove mpegvideo.c img resample dependancy 
Originally committed as revision 5258 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-31 20:43:37 +00:00
Loren Merritt
e77ef2755a prefetch pixels for future motion compensation. 4-10% faster mpeg1/2/4 decoding (on an athlon-xp). 
Originally committed as revision 5204 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-23 21:54:46 +00:00
Måns Rullgård
1bd8624697 kill some warnings 
Originally committed as revision 5063 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-25 22:41:31 +00:00
Michael Niedermayer
8cb90572a2 1 goto 1 fix 
Originally committed as revision 4946 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-06 11:21:26 +00:00
Steve L'Homme
68b51e58ce MSVC-compatible __align8/__align16 declaration 
patch by Steve Lhomme, steve .dot. lhomme .at. free .dot. fr

Originally committed as revision 4942 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-05 13:35:17 +00:00
Michael Niedermayer
809b2a30b2 simplify 
Originally committed as revision 4940 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-04 22:18:45 +00:00
Michael Niedermayer
82fcbc145d faster find_startcode() 
Originally committed as revision 4939 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-04 20:32:02 +00:00
Loren Merritt
fdb52bccf6 fix crash on height < 16 pixels. 
Originally committed as revision 4904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-28 00:57:59 +00:00
Corey Hickey
7e41c35436 Add a newline to b_frame_strategy error message. 
Originally committed as revision 4903 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-27 23:24:24 +00:00
Michael Niedermayer
07fc2b8278 fixing bframe strategy 2 
bits vs. bytes factor of 8 error
  16 byte offset error
  some other minor things

Originally committed as revision 4902 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-27 13:19:13 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address. 
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-12 22:43:26 +00:00
Tom Joseph
ee0d2803ec H.263: more descriptive error message 
patch by Tom Joseph < tom-lists @@ @ @@ jambon @@ dot @@ ll @@ dot @@ cx >

Originally committed as revision 4812 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-04 17:07:30 +00:00
Michael Niedermayer
88e51e1fb5 second try of improved lambda/qp guessing for motion estimation RD in first pass 
Originally committed as revision 4785 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-29 15:46:23 +00:00
Michael Niedermayer
e8501c93b5 support downscaling frames for dynamic b frame decission 
Originally committed as revision 4776 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-25 18:34:02 +00:00
Michael Niedermayer
984b8e4de1 b frame strategy 2 
Originally committed as revision 4774 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-25 17:30:52 +00:00
Michael Niedermayer
82b019cefd better f_code guessing in 2nd pass 
Originally committed as revision 4766 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-22 22:48:09 +00:00
Michael Niedermayer
50c6f6cd4c improved lambda/qp guessing for motion estimation RD in first pass 
this only affects encoding with bframes and rate control

Originally committed as revision 4765 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-22 14:17:54 +00:00
Diego Biurrun
bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting 
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-22 01:10:11 +00:00
Michael Niedermayer
8ed9f9ab32 use correct qp & lambda for ME on the second pass 
Originally committed as revision 4757 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-19 13:41:27 +00:00
Michael Niedermayer
2ceff404b5 forgot 
Originally committed as revision 4756 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-19 03:08:08 +00:00
Michael Niedermayer
71160c55e0 fix q=0 bug 
Originally committed as revision 4754 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-18 19:59:33 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace. 
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-17 18:14:38 +00:00
Måns Rullgård
4733abcbf3 use PRIxN, %zd, %td formats where needed 
Originally committed as revision 4740 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-12 01:56:46 +00:00
Michael Niedermayer
60d76256cb psnr calculation with threads>1 fix 
Originally committed as revision 4725 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-07 18:21:16 +00:00
Michael Niedermayer
a75a3ca429 frame skip fixes 
fix 16pixel error in comparission
 fix vbv messup
 fix unlimited skip intervals, limited by GOP now

Originally committed as revision 4678 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-11-05 00:16:03 +00:00
Måns Rullgård
bf4e3bd2d0 kill a bunch of compiler warnings 
Originally committed as revision 4522 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-08-14 15:42:40 +00:00
Martin Boehme
acb22f9391 Fix for overflow issue in mpegvideo.c patch by (Martin Boehme: boehme, inb uni-luebeck de) 
this integer overflow might lead to the execution of arbitrary code during encoding with threads

Originally committed as revision 4474 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-07-25 23:07:27 +00:00
Michael Niedermayer
8c3eba7c62 skip_idct 
skip_frame
skip_loop_filter

Originally committed as revision 4440 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-07-14 21:39:36 +00:00
Diego Biurrun
bb628dae44 spelling fixes 
patch by Peter Robinson pbrobinson @ at @ gmail . dot . com and myself

Originally committed as revision 4382 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-06-17 15:02:53 +00:00
Michael Niedermayer
ded8477def fix max b frames with b frame strategy 1 
Originally committed as revision 4300 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-21 22:20:26 +00:00
Måns Rullgård
30344a83e0 remove/replace non-ascii characters 
Originally committed as revision 4237 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-13 21:04:16 +00:00
Michael Niedermayer
bf873ee62a b_frame_strategy sanity check 
Originally committed as revision 4222 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-12 01:31:11 +00:00
Michael Niedermayer
9cd8179818 #defines for strict_std_compliance and split between inofficial extensions and non standarized things 
Originally committed as revision 4205 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-08 20:15:42 +00:00
Michael Niedermayer
6b51185c63 overflow fix 
Originally committed as revision 4201 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-08 09:58:41 +00:00
Michael Niedermayer
1192ce3707 complain about mpeg4 limits only if codec_id == MPEG4 
Originally committed as revision 4200 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-08 00:44:06 +00:00
Michael Niedermayer
8b975b7ca5 put most codecs under ifdefs 
Originally committed as revision 4173 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-02 22:14:42 +00:00
Michael Niedermayer
c0df9d75bd switch to native time bases 
Originally committed as revision 4168 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-30 21:43:59 +00:00
Mike Melanson
160d679c07 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped") 
Originally committed as revision 4153 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-24 17:21:11 +00:00
Kevin Baragona
dfb706da4d Spelling errors patch by (Kevin Baragona | kevinmb500 gawab com) 
Originally committed as revision 4151 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-24 11:13:49 +00:00
Michael Niedermayer
ee572c5482 remove duplicate clip to 8bit function 
Originally committed as revision 4143 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-20 10:05:15 +00:00
Mike Melanson
6f921f3100 remove superfluous CONFIG_ENCODERS (entire function is already wrapped) 
Originally committed as revision 4139 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-19 04:29:11 +00:00
Michael Niedermayer
09c3e44e8a motion estimation bitrate penalty compensation 
Originally committed as revision 4092 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-27 12:19:59 +00:00
Michael Niedermayer
cec1f05fd7 check mb/me_threshold range, fixes assertion failure 
Originally committed as revision 4082 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-26 18:10:44 +00:00
Michael Niedermayer
02dc898338 alignment fix 
Originally committed as revision 4059 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-19 13:10:09 +00:00
Michael Niedermayer
40c5fa2689 AVOption removial patch from (James A. Morrison >ja2morri csclub.uwaterloo ca>) 
with minor changes from me

Originally committed as revision 4019 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-06 23:20:53 +00:00
Loren Merritt
2f944356bf H.264: decode arbitrary frame orders and allow B-frames as references. 
Originally committed as revision 4003 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-04 12:47:38 +00:00
Loren Merritt
e21f398378 vismb: display 4x4 partition boundaries in H.264 
Originally committed as revision 3999 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-03 06:57:17 +00:00
Michael Niedermayer
8dd2a893dd set supported pix_fmts 
Originally committed as revision 3982 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-25 15:06:21 +00:00
Måns Rullgård
88730be651 kill warnings patch by (Måns Rullgård <mru inprovide com>) 
Originally committed as revision 3977 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-24 19:08:50 +00:00
Josh Varner
fe533bb3a7 removing --disable-risky patch by (Josh Varner <jlvarner gmail com>) 
Originally committed as revision 3966 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-21 17:50:48 +00:00
Christophe Massiot
957c743a23 Border processing adaptive quant patch by (Christophe Massiot |cmassiot freebox fr) 
Originally committed as revision 3927 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-02 18:49:04 +00:00
Johan Bilien
ebaa7e0315 rtp_callback: send number of mb patch by (Johan Bilien {jobi via.ecp fr) 
Originally committed as revision 3926 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-02 18:14:59 +00:00
Michael Niedermayer
e8ea90123d framerate check 
Originally committed as revision 3869 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-23 14:07:25 +00:00
Michael Niedermayer
dd4f8a04fe jpeg style yuv fixes 
Originally committed as revision 3852 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-20 00:30:20 +00:00
Michael Niedermayer
a9c3ff5b9e assertion about bits statistic and minor bits stat fix 
Originally committed as revision 3835 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-14 23:48:12 +00:00
Michael Niedermayer
30231f8169 10l (dont modify the input picture pts) 
Originally committed as revision 3833 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-13 11:59:19 +00:00
Kurosu
f41c1fac3c av_malloc vs av_mallocz patch by (Kurosu <kurosu inforezo org>) 
Originally committed as revision 3830 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-12 18:25:48 +00:00
Michael Niedermayer
0ecca7a49f various security fixes and precautionary checks 
Originally committed as revision 3822 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-12 00:16:25 +00:00
Michael Niedermayer
eaba7c7fd6 picture heap corruption fix 
Originally committed as revision 3819 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-10 23:41:25 +00:00
Loren Merritt
650cec0c8c vismv for h264 displayed incorrect motion vectors. 
Originally committed as revision 3765 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-20 03:03:37 +00:00
Michael Niedermayer
3c9ec07ef2 quantizer overflow warning + AAN dct fix 
Originally committed as revision 3754 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-14 20:17:23 +00:00
Michael Niedermayer
732ce18eab warn the user if the quantization code could overflow with the selected custom matrix and qp limits 
Originally committed as revision 3747 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-11 18:33:18 +00:00
Michael Niedermayer
0fd6aea1f1 more flexible frame skip decission 
Originally committed as revision 3743 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-08 18:02:56 +00:00
Michael Niedermayer
bbf18b21b7 frame skip support 
Originally committed as revision 3742 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-08 11:46:16 +00:00
Michael Niedermayer
d0271e8a3a rv20 encoding 
Originally committed as revision 3739 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-07 13:14:37 +00:00
Michael Niedermayer
6989963c1f 10l (dont use codec_id for error simulation) 
Originally committed as revision 3718 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-28 14:58:50 +00:00
Burkhard Plaum
073c2593c9 Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>) 
Originally committed as revision 3717 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-27 18:10:06 +00:00
Michael Niedermayer
6db2583c4f check num_entries too to avoid reading over the array end and dont check i>0 it must be >0 there 
Originally committed as revision 3708 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-24 00:15:49 +00:00
Loren Merritt
80516d720a Fixes a segfault when flushing delayed B-frames on the 2nd pass. patch by (Loren Merritt <lorenm.u@washington@edu>) 
Originally committed as revision 3707 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-23 23:58:54 +00:00
Maarten Daniels
ccff9da62a H261 fixing and cleaning: 
-corrected wrong value in mv data
 -set correct mb_type after adjusting index
 -don't use H263 loop filter when the loop filter flag is set but when
  using the H261 encoder
 -use the same unquantizer as H263 (which is optimized btw)
 -removed unused members in H261Context
patch by (Maarten Daniels <maarten.daniels >at< luc >dot< ac >dot< be>)

regression test checksum update by me

Originally committed as revision 3669 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-11-12 01:21:34 +00:00
Michael Niedermayer
1c3990dbba H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>) 
Originally committed as revision 3643 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-28 10:12:57 +00:00
Michael Niedermayer
035817727f support strictly enforcing gop size 
Originally committed as revision 3594 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-15 02:37:04 +00:00
Michael Niedermayer
9efc77c86f fix forcing of individual frame types 
Originally committed as revision 3593 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-14 12:24:16 +00:00
Michael Niedermayer
ac8b03c0a8 lowres 4mv 
Originally committed as revision 3576 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-09 12:02:19 +00:00
Michael Niedermayer
5f6c92d40c h.261 loop filter fix 
closes bug #1033108

Originally committed as revision 3574 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-08 22:57:39 +00:00
Milan Cutka
125af02243 Quantizer noise shaping crashes on SSE2 machines patch by (Milan Cutka <cutka at szm dot sk>) 
Originally committed as revision 3571 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-08 10:37:45 +00:00
Michael Niedermayer
4f8a831994 set AVCodecContext.width/height to the picture width/height instead of the one stored in the bitstream (that only matters if lowres!=0) 
Originally committed as revision 3518 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-27 02:39:55 +00:00
Michael Niedermayer
718455951c lowres chroma fix 
Originally committed as revision 3517 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-26 23:01:42 +00:00
Michael Niedermayer
0f74857497 lowres slice fix 
Originally committed as revision 3516 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-26 21:28:31 +00:00
Michael Niedermayer
da9c9637ae low resolution interlaced support 
Originally committed as revision 3512 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-26 11:05:35 +00:00
Michael Niedermayer
178fcca848 1/2 resolution decoding 
Originally committed as revision 3507 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-25 23:18:58 +00:00
Michael Niedermayer
3c00436b3e 100l 
Originally committed as revision 3501 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-24 17:30:04 +00:00
Michael Niedermayer
9ebb8e1124 check if the user specified timestamps are strictly monotone 
timestamp guess code 10l fix

Originally committed as revision 3483 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-20 13:47:47 +00:00
Loren Merritt
1140139fe2 10l (scene change pict_type was wrong after coded_frame fix) patch by (Loren Merritt <lorenm at u dot washington dot edu>) 
Originally committed as revision 3471 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-16 17:36:39 +00:00
Michael Niedermayer
b100eab869 changing size segfault fix 
Originally committed as revision 3463 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-15 00:35:18 +00:00
Michael Niedermayer
d32064c0f7 comment fix 
Originally committed as revision 3462 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-14 18:35:03 +00:00
Michael Niedermayer
2d3601b564 qprd + mpeg2 segfault fix 
Originally committed as revision 3461 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-14 17:17:12 +00:00
Michael Niedermayer
7b37a6e984 10l (wrong coded_picture) 
Originally committed as revision 3441 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-08 10:07:08 +00:00
Michael Niedermayer
1765920791 minor optimization 
Originally committed as revision 3386 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-08-13 14:40:33 +00:00
Michael Niedermayer
1477ec35dd 10l (dont store 2 different things at the same place ...) 
Originally committed as revision 3380 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-08-11 19:32:34 +00:00
Christophe Massiot
f1dc14a9fa miscalculation of header_bits when using the -thread option bugfix, patch by (Christophe Massiot <cmassiot at freebox dot fr>) 
Originally committed as revision 3329 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-07-20 17:13:08 +00:00
Michael Niedermayer
77e6c403e7 10l (fixes delayed frames during encoding) 
Originally committed as revision 3278 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-30 23:12:21 +00:00
Ivan Kalvachev
ffdff4d7e8 mpeg2 chroma422/444 support, may be slower, may be faster for other codecs 
Originally committed as revision 3215 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-11 07:59:12 +00:00
Michael Niedermayer
d4c5d2adf3 nsse weight 
Originally committed as revision 3205 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-07 17:30:02 +00:00
Michael Niedermayer
e6a2ac3474 noise preserving sum of squares comparission function 
Originally committed as revision 3204 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-07 03:23:31 +00:00
Michael Niedermayer
23854cadec sanity checks 
Originally committed as revision 3202 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-06 19:44:05 +00:00
Michael Niedermayer
a1e07d39be qscale + qprd fix 
Originally committed as revision 3192 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-05 18:10:23 +00:00
Michael Niedermayer
0e9d4a67f4 change qscale -> lambda for the motion estimation 
finetune bit/distortion weighting factor used in motion estimation, the old coeffs where finetuned relative to incorrect mv_penalty tables which where then fixed later but the coeffs where not
this _may_ fix the long standing blocking artifacts, but may also introduce mudding artefacts theoretically, so please tell us if u stumble across any so we can either fix them or export this variable so the user can change it

Originally committed as revision 3189 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-03 19:29:47 +00:00
Michael Niedermayer
bb8140f29d h261 dequant fix 
Originally committed as revision 3180 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-31 00:42:55 +00:00
Michael Niedermayer
c6148de232 h261 decoder by (Maarten Daniels <maarten.daniels at student dot luc dot ac dot be>) 
Originally committed as revision 3176 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-30 20:37:15 +00:00
Michael Niedermayer
5751815562 export low_delay for encoding too 
Originally committed as revision 3170 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-29 15:16:52 +00:00
Chris Flerackers
a7fcb3ea5c rtp callback context patch by ("Chris Flerackers" <cflerackers at androme dot be>) 
Originally committed as revision 3141 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-18 17:23:49 +00:00
Michael Niedermayer
e96682e6f4 some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>) 
Originally committed as revision 3140 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-18 17:09:46 +00:00
Michael Niedermayer
1f202b0d46 moving motion estimation specific variables from MpegEncContext -> MotionEstContext 
Originally committed as revision 3124 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-11 01:38:46 +00:00
Michael Niedermayer
eea8c08fa8 cleanup & memleak fix 
Originally committed as revision 3095 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-30 17:42:58 +00:00
Michael Niedermayer
bf266e195a intra_dc_precission>0 encoding support 
Originally committed as revision 3093 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-30 13:44:29 +00:00
Michael Niedermayer
844ce49d12 10l 
Originally committed as revision 3090 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-30 01:35:45 +00:00
Michael Niedermayer
000a9c02db 10l 
Originally committed as revision 3088 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-29 22:12:29 +00:00
Michael Niedermayer
e4cb187db8 remove duplicated find_frame_end() code 
move codec specific code from parser.c -> <codecname>.c as far as its easily possible

Originally committed as revision 3087 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-29 14:21:33 +00:00
Michael Niedermayer
9964df63ee minor motion estimation cleanup 
4mv motion vector passthrough

Originally committed as revision 3051 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-24 03:36:37 +00:00
Michael Niedermayer
1671083f55 sanity check 
Originally committed as revision 3047 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-23 21:17:31 +00:00
Michael Niedermayer
f4f3223ffd reuse motion vectors/mb types/field select values of the source video, if the SSE for a macroblock which is predicted with these values is below me_threshold 
currently works only with mpeg1/2 source or some luck
may need -sync 0 as otherwise framedrops could lead to extreemly long b frame sequences

Originally committed as revision 3042 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-23 19:06:30 +00:00
Michael Niedermayer
7c4f71c428 exporting field_select/ref_index values 
Originally committed as revision 3035 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-19 03:33:23 +00:00
Michael Niedermayer
3803021453 fix y scale of mv vissualization of interlaced MVs 
Originally committed as revision 3033 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-18 18:30:05 +00:00
Michael Niedermayer
a4d36c1113 passing AVFrame instead of AVPicture around in ffmpeg, that way stuff like motion vectors can be passed from the decoder to the encoder 
moving ref_index from Picture to AVFrame

Originally committed as revision 3028 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-17 19:41:49 +00:00
Michael Niedermayer
14e2a9404e flv dropable p frame support 
Originally committed as revision 3027 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-17 13:36:21 +00:00
Michael Niedermayer
137c8468e8 unify table indexing (motion_val,dc_val,ac_val,coded_block changed) 
minor +-1 bugfix

Originally committed as revision 3016 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-16 01:01:45 +00:00
Michael Niedermayer
8100cab9c6 nicer looking arrows for the motion vector vissualization 
Originally committed as revision 2950 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-03 01:55:24 +00:00
Michael Niedermayer
b44bdf7eec interlaced chroma MC divx-bug workaround 
Originally committed as revision 2947 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-04-02 19:54:33 +00:00
Michael Niedermayer
b73afeac30 huge vbv buffer size + CBR fix 
Originally committed as revision 2929 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-26 12:30:04 +00:00
Falk Hüffner
7906085fcc warning patrol 
Originally committed as revision 2925 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-24 23:32:48 +00:00
Michael Niedermayer
6b47b7300e Compile fix by (Chip <szarlada at freemail dot hu>) 
Originally committed as revision 2915 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-22 12:07:02 +00:00
Michael Niedermayer
7976241aef moving f/b_code init to where it should be 
Originally committed as revision 2901 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-16 17:27:03 +00:00
Michael Niedermayer
3edcacde04 init cleanup 
Originally committed as revision 2899 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-16 16:11:29 +00:00
Michael Niedermayer
37923cd32d alignment fix 
Originally committed as revision 2890 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-14 17:55:50 +00:00
Michael Niedermayer
67086c8552 width,height%16!=0 fix 
Originally committed as revision 2889 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-14 17:33:48 +00:00
Michael Niedermayer
1da57984e6 10l 
Originally committed as revision 2871 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-11 13:22:39 +00:00
Michael Niedermayer
ca5b9f20b2 10l 
Originally committed as revision 2848 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-05 15:10:56 +00:00
Michael Niedermayer
ed263031f6 100l (divx5 b frame + seeking + flush fix) 
Originally committed as revision 2836 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-02 03:18:03 +00:00
Ivan Kalvachev
5e5c247a7c initial chroma_format changes,xvmc tweaks and codec_cap 
Originally committed as revision 2833 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-01 14:55:21 +00:00
Michael Niedermayer
95d356c587 optimizing/cleanup of mpeg/qpel_motion() 
Originally committed as revision 2831 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-29 22:14:46 +00:00
Michael Niedermayer
c8a4ebbf27 simplify MPV_motion() 
Originally committed as revision 2828 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-29 02:08:28 +00:00
Michael Niedermayer
5ba326b5d4 interlaced mpeg4 + edge emu fix (fixes decoding of mermaid.avi) 
related cleanup

Originally committed as revision 2827 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-29 00:37:36 +00:00
Michael Niedermayer
259630df42 10l (vdpart fix) 
Originally committed as revision 2822 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-26 19:11:21 +00:00
Michael Niedermayer
ae35f5e14e 100l (field picture decoding fix) 
Originally committed as revision 2818 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-26 02:48:07 +00:00
Wolfgang Hesseler
8289c6faa8 export DCT coefficients patch by (Wolfgang Hesseler <wolfgang.hesseler at imk dot fraunhofer dot de>) 
Originally committed as revision 2816 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-25 18:29:17 +00:00
Michael Niedermayer
9740beffc6 use AVFrame.pts=AV_NOPTS_VALUE instead of AVFrame.pts=0 
move AV_NOPTS_VALUE & AV_TIME_BASE from avformat.h -> avcodec.h
related fixes

Originally committed as revision 2814 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-25 17:35:52 +00:00
Michael Niedermayer
e51f49487e set AVFrame.pts based upon framerate if its 0 
detect & warn if the user prvides pts only for some frames, and try to guess the missing ones

Originally committed as revision 2812 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-25 02:05:50 +00:00
Michael Niedermayer
c62c07d3d7 multithreaded mpeg2 decoding 
Originally committed as revision 2810 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-23 20:56:56 +00:00
Michael Niedermayer
5e7c25f0d1 simplify 
Originally committed as revision 2801 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-18 22:54:02 +00:00
Michael Niedermayer
fbf2284cd2 check if threads_count is too large 
Originally committed as revision 2798 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-18 16:26:16 +00:00
Michael Niedermayer
da16b2043f noise reduction with threads bugfix 
Originally committed as revision 2789 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-17 18:57:50 +00:00
Michael Niedermayer
fafbc7c8c8 mpeg4 b frame + adaptive quantization assertion failure fix 
Originally committed as revision 2779 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-14 03:49:43 +00:00
Michael Niedermayer
3a1fa44759 multithreaded spatial complexity calculation for i frames 
Originally committed as revision 2778 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-14 03:21:03 +00:00
Michael Niedermayer
b6335c9f5b ff_copy_bits() optimization 
Originally committed as revision 2777 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-14 01:25:41 +00:00
Michael Niedermayer
a734250db6 activate the memcpy special case for the byte aligned case in ff_copy_bits(), wasnt working before because of a incorrectly used pbBufPtr() 
Originally committed as revision 2775 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-13 21:07:31 +00:00
Michael Niedermayer
cfbd16df75 replace a few pbBufPtr() by put_bits_count(), one of them was actually wrong 
Originally committed as revision 2774 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-13 20:59:48 +00:00
Michael Niedermayer
9c3d33d67f multithreaded/SMP motion estimation 
multithreaded/SMP encoding for MPEG1/MPEG2/MPEG4/H263
all pthread specific code is in pthread.c
to try it, run configure --enable-pthreads and ffmpeg ... -threads <num>
the internal thread API is a simple AVCodecContext.execute() callback which executes a given function pointer with different arguments and returns after finishing all, that way no mutexes or other thread-mess is needed outside pthread.c

Originally committed as revision 2772 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-13 17:54:10 +00:00
Tinic Uro
747a0554ea - made --extra-cflags option work on darwin 
- allow INTER4V macroblocks for FLV1 codec
- fixed issue in flv file format saving 8 mp3 frames per packet instead of 1
- fixed crasher in flv file format involving mp3 buffer handling
- added FLV1 codec support for swf file format (FlashPlayer6 or above
required) and made it default
- fixed broken mp3 support in swf file format
patch by (Tinic Uro <turo at macromedia dot com>)
cleanup by me

Originally committed as revision 2756 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-06 23:56:37 +00:00
Alex Beregszaszi
fe455f3328 get_bit_count -> put_bits_count 
Originally committed as revision 2752 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-06 15:27:31 +00:00
Michael Niedermayer
de7ff1f774 analyze the gradient of the error surface to avoid a few checks in the quantizing noise shaper 
Originally committed as revision 2751 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-06 03:56:05 +00:00
Michael Niedermayer
364a179749 quantizer noise shaping optimization 
Originally committed as revision 2750 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-06 02:12:37 +00:00
Michael Niedermayer
deb7a6cdaf simplify 
Originally committed as revision 2743 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-02 14:59:43 +00:00