generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
52,644 Commits 24 Branches 241 Tags 173 MiB
67731ef40f
Commit Graph

399 Commits

Author SHA1 Message Date
Michael Niedermayer
0d31833d04 check data_size in decode_frame() 
Originally committed as revision 19986 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 11:29:38 +00:00
Diego Biurrun
83614f2df9 Reduce pointless verbosity after seeks in the MP3 decoder. 
Originally committed as revision 19759 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-04 19:04:12 +00:00
Michael Niedermayer
822d0a6e0c Drop code that attempts to decode frames that are prefixed by junk. 
Too often it ends up decoding random data into noise without detecting
it (for example after seeking of some MP3 data with oddly often occurring
startcode emulation).
Fixes issue1154.

Originally committed as revision 19302 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-30 03:57:27 +00:00
Måns Rullgård
1e24f1b25d mpegaudio: enclose SUM8() macro args in parens when used 
Originally committed as revision 18746 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-05 18:44:13 +00:00
Måns Rullgård
bf030c887f mpegaudio: avoid unnecessary copy in high-precision mode 
Originally committed as revision 18745 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-05 18:44:10 +00:00
Måns Rullgård
adb206c238 mpegaudio: use av_clip() 
Originally committed as revision 18744 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-05 18:44:07 +00:00
Zdenek Kabelac
e2fa5cf4c9 Do not scan for MP3 header after the given buffer and return skipped 
bytes along with consumed bytes on successful decoding.
patch by Zdenek Kabelac, zdenek.kabelac gmail com

Originally committed as revision 18736 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-04 14:23:48 +00:00
Michael Niedermayer
b52b6ae489 Remove unused variable from decode_init() found by CSA. 
Originally committed as revision 18550 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-17 13:57:22 +00:00
Stefano Sabatini
9106a698e7 Rename bitstream.h to get_bits.h. 
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-13 16:20:26 +00:00
Thilo Borgmann
7a00bbad21 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an 
AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows
passing of packet-specific flags from demuxer to decoder, such as the keyframe
flag, which appears necessary to playback corePNG P-frames.

Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread
"Google Summer of Code participation" on the mailinglist.

Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 15:59:50 +00:00
Daniel Verkamp
5ef251e504 Add missing av_cold in static init/close functions. 
Patch by Daniel Verkamp daniel at drv dot nu.

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

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 02:00:19 +00:00
Andreas Öman
cf92cec7d8 Avoid allocating MPADecodeContext on stack. 
Instead move relevant fields into MPADecodeHeader and use it
where appropriate.

Originally committed as revision 16728 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-23 12:09:32 +00:00
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences. 
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-19 15:46:40 +00:00
Aurelien Jacobs
49cdad8d78 simplify: group all the AUDIO_NONSHORT parameters in the same place 
Originally committed as revision 16602 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 21:41:05 +00:00
Diego Biurrun
0f6a659ddf Replace #ifdef CONFIG_ preprocessor check by #if CONFIG_. 
CONFIG_ changed semantics and is always defined now.

Originally committed as revision 16598 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 07:57:12 +00:00
Diego Biurrun
ad1eebe360 Use CONFIG_MPEGAUDIO_HP directly instead of USE_HIGHPRECISION indirection. 
Originally committed as revision 16594 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 00:48:17 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +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
Andreas Öman
11c23b64ac Revert r16257: 
Include "libavutil/common.h" where we use llrint() in case ffmpeg's
own llrint() is to be used.

Originally committed as revision 16282 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-22 22:39:55 +00:00
Andreas Öman
1af34f094e Include "libavutil/common.h" where we use llrint() in case ffmpeg's 
own llrint() is to be used.

Originally committed as revision 16257 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-21 21:53:42 +00:00
Måns Rullgård
4deaa94639 Add shift argument to MULL() macro 
This replaces use of FRAC_BITS in the MULL() definition with a third
argument specifying the shift amount.  All uses of this macro are
updated to pass FRAC_BITS as third argument.

Originally committed as revision 15921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-24 09:28:55 +00:00
Aurelien Jacobs
37d3e0667a uses FF_ARRAY_ELEMS() where appropriate 
Originally committed as revision 15662 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-21 21:40:24 +00:00
Michael Niedermayer
1d4113d053 Only print "invalid new backstep" when it is really invalid. 
Fixes issue541.

Originally committed as revision 15339 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-16 01:49:32 +00:00
Michael Niedermayer
bf3a971c12 Make decoder more robust by default against broken encoders. 
Fixes issue540.

Originally committed as revision 15336 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-16 00:31:32 +00:00
Michael Niedermayer
047599a4ba Rename error_resilience to error_recognition. 
Originally committed as revision 15270 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-08 18:18:49 +00:00
Michael Niedermayer
969c163f1f Remove debuging junk that probably hasnt been used by anyone since years. 
Originally committed as revision 15133 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 20:26:28 +00:00
Art Clarke
bbdf87285a Use static vlc structure to decode layer 3 huffman tables. 
Patch by Art Clarke aclarke vlideshow com

Originally committed as revision 14483 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-31 12:09:11 +00:00
Andreas Öman
b000c604f2 Decrease severity of 'invalid new backstep' log message to warning 
in mpeg audio decoder.

Originally committed as revision 14313 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-20 15:01:20 +00:00
Andreas Öman
11f63a221b Supply context argument to av_log() in mpeg audio decoder. 
Originally committed as revision 14312 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-20 14:58:49 +00:00
Måns Rullgård
9ea583e1f6 mpegaudio: use MAC/MLS macros in ff_mpa_synth_filter 
Originally committed as revision 14199 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-13 12:23:02 +00:00
Stefano Sabatini
fe4bf37455 Make AVCodec long_names definition conditional depending on CONFIG_SMALL. 
Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-12 21:50:13 +00:00
Stefano Sabatini
162d4fc99d Add long names to AVCodec declarations. 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13009 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-27 22:39:51 +00:00
Baptiste Coudurier
169203c1d9 break if error in header so it can output already decoded frames 
Originally committed as revision 12999 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 14:41:29 +00:00
Baptiste Coudurier
41b8800f88 merge init with declaration 
Originally committed as revision 12998 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 14:36:34 +00:00
Baptiste Coudurier
f91c089812 cosmetics: merge decls 
Originally committed as revision 12997 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 14:34:01 +00:00
Baptiste Coudurier
5fd7a9fcdf simplify: merge loops 
Originally committed as revision 12996 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 14:33:09 +00:00
Baptiste Coudurier
8da8970d01 simplify 
Originally committed as revision 12995 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 14:30:06 +00:00
Baptiste Coudurier
0d5b2eb445 simplify: remove useless fields and vars 
Originally committed as revision 12994 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 14:28:18 +00:00
Baptiste Coudurier
676e26ab6d move MP3On4DecodeContext def near the code and under ifdef 
Originally committed as revision 12993 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 14:22:43 +00:00
Baptiste Coudurier
9f95bfe2b9 correctly patch syncword for samples rates < 16000, decoder now fully support all iso ref files 
Originally committed as revision 12992 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 14:18:29 +00:00
Baptiste Coudurier
f0f53c83ba fix 1 frame config decoding 
Originally committed as revision 12991 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 14:10:31 +00:00
Baptiste Coudurier
60dfa0b8d4 remove old draft last case not present anymore in iso specs 
Originally committed as revision 12990 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 14:08:34 +00:00
Baptiste Coudurier
b61d2782f3 use mpeg4audio common code 
Originally committed as revision 12988 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 13:56:52 +00:00
Baptiste Coudurier
ec39f7d855 simplify 
Originally committed as revision 12986 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 13:08:16 +00:00
Baptiste Coudurier
9708d52ee8 correctly compute out_size and samples number 
Originally committed as revision 12985 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 13:03:41 +00:00
Baptiste Coudurier
cd3289650a fsize is 12 bits according to specs 
Originally committed as revision 12984 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 12:59:46 +00:00
Baptiste Coudurier
5be25fc133 simplify using FFMIN3 
Originally committed as revision 12983 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 12:51:52 +00:00
Baptiste Coudurier
a82dcdffb2 return error if buf_size is too small 
Originally committed as revision 12981 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 12:39:45 +00:00
Baptiste Coudurier
dfcd6d91fe values can fit uint8_t 
Originally committed as revision 12980 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 12:34:37 +00:00
Baptiste Coudurier
183fceaafd add const 
Originally committed as revision 12979 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 12:33:02 +00:00
Baptiste Coudurier
6122b733e9 omg, fix compilation 
Originally committed as revision 12509 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-20 09:38:55 +00:00
Baptiste Coudurier
d0ed455f19 correctly set avctx->frame_size for mp3on4 and mp3adu 
Originally committed as revision 12508 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-20 09:36:04 +00:00
Diego Biurrun
5e53486545 typo fix: inited --> initialized 
Originally committed as revision 11920 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-13 09:26:10 +00:00
Michael Niedermayer
7993df6527 consts 
I have underestimated this a little, and these are just some ...

Originally committed as revision 11708 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-01 03:26:31 +00:00
Michael Niedermayer
9f7458b285 Factorize some code into functions, had this in my tree and will be 
needed for mp3 encoding.

Originally committed as revision 11509 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-11 21:34:05 +00:00
Brian Brice
812f29ffb8 Clear synth_buf on flush(). Part of a patch by Brian Brice bbrice gmail com. 
Originally committed as revision 11507 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-11 18:20:42 +00:00
Brian Brice
4a69055bad Flush mp2 as well on seeking. Part of a patch by Brian Brice bbrice gmail com. 
Originally committed as revision 11506 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-11 18:18:45 +00:00
Martin Lindhe
3240941b25 Move 2 defines from mpegaudiodec.c to mpegaudiodata.h to allow compilation 
when DEBUG is defined.
Patch by Martin Lindhe: martin startwars org

Originally committed as revision 10955 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-08 10:53:32 +00:00
Aurelien Jacobs
aee481cebe use av_clip_int16() where it makes sense 
Originally committed as revision 10078 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-11 22:48:55 +00:00
Alex Beregszaszi
7ae7300ee3 use skip_bits where appropriate 
Originally committed as revision 10004 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 00:57:36 +00:00
Alex Beregszaszi
5fc32c275e use get_bits1(..) instead get_bits(.., 1) 
Originally committed as revision 9999 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-08-09 00:13:31 +00:00
Måns Rullgård
c2d08dc0d7 move a couple of macros and structs to mpegaudio.h 
Originally committed as revision 9343 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-16 22:58:43 +00:00
Ramiro Polla
2c124cb65c Use AV_xx throughout libavcodec 
Originally committed as revision 9169 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-02 01:41:07 +00:00
Michael Niedermayer
d5aa01cd30 make decoder decode the first frame properly if theres more than just one 
frame input

Originally committed as revision 9144 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-27 22:34:49 +00:00
Aurelien Jacobs
08aa2c9bd2 remove dependency of mpeg audio encoder over mpeg audio decoder 
Originally committed as revision 9082 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-20 22:50:29 +00:00
Aurelien Jacobs
ca6e50afc1 add a ff_ prefix to some mpegaudio funcs 
Originally committed as revision 9081 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-20 15:11:55 +00:00
Aurelien Jacobs
4bd8e17c8d loosen dependencies over mpegaudiodec 
Originally committed as revision 9080 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-20 13:40:07 +00:00
Aurelien Jacobs
677fe2e226 add proper prefix to extern mpeg audio data tables 
Originally committed as revision 9061 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-19 00:13:35 +00:00
Aurelien Jacobs
4991c0516d move some common mpeg audio tables from mpegaudiodectab.h to mpegaudiodata.c 
Originally committed as revision 9060 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-19 00:06:02 +00:00
Reimar Döffinger
c6bcbb2cd3 Use DECLARE_ALIGNED to ease porting 
Originally committed as revision 9031 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-15 20:47:55 +00:00
Diego Biurrun
5a6a6cc7dc Fix multiple "‘inline/static’ is not at beginning of declaration" warnings. 
Originally committed as revision 8894 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-05 12:18:14 +00:00
Diego Biurrun
fe0372296a typos 
Originally committed as revision 8642 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-07 14:10:02 +00:00
Michael Niedermayer
9608652dc1 kill another 2 av_mallocz_static() 
Originally committed as revision 8396 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-14 00:19:56 +00:00
Michel Bardiaux
318c5e0524 Give context to dprintf 
Originally committed as revision 8338 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-12 12:36:41 +00:00
Michael Niedermayer
5773d46009 factorize switch_buffer() 
Originally committed as revision 7813 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-03 13:15:55 +00:00
Michael Niedermayer
e0cf92048a fix decoding of takethat.mp3 
Originally committed as revision 7812 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-03 12:42:12 +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
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
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
Michael Niedermayer
bd60e11bf4 more checks and error messages 
Originally committed as revision 7069 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-14 20:35:15 +00:00
Michael Niedermayer
498c544ad2 dont set the sampling rate just because 1 mp3 packet header says so (fixes playback speed on some old mencoder generated avis which where then dumped to mp3) 
Originally committed as revision 6837 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-30 02:19:55 +00:00
Michael Niedermayer
c0d8052b50 avoid random noise on damaged frames 
Originally committed as revision 6836 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-30 01:29:56 +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
Diego Biurrun
e1931c59f6 message typo fixes 
Originally committed as revision 6564 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-05 18:15:17 +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
Luca Barbato
004390a639 Use mathops 
Originally committed as revision 6323 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-22 15:57:23 +00:00
Michael Niedermayer
39e1b5cf8e use correct rounding functions 
this should fix a floating point exception on some systems
lets hope these arent missing anywhere, if so another solution must be found

Originally committed as revision 6290 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-19 09:31:00 +00:00
Baptiste Coudurier
8e453fc3c7 remove unused, uninitialized free format frame size 
Originally committed as revision 6256 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-15 10:28:23 +00:00
Siarhei Siamashka
1839e854e5 Proper armv5te instructions support detection. 
patch by Siarhei Siamashka, siarhei dot siamashka gmail com

Originally committed as revision 6246 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-13 21:39:41 +00:00
Siarhei Siamashka
024da4b146 armv5 optimizations 
patch by Siarhei Siamashka siarhei.siamashka at gmail com

Originally committed as revision 6228 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-10 22:29:02 +00:00
Michael Niedermayer
7b95bc5842 print more correct error messges 
Originally committed as revision 6194 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-08 08:27:51 +00:00
Måns Rullgård
0e176c3eb5 remove redundant declarations 
Originally committed as revision 6153 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-02 23:10:28 +00:00
Michael Niedermayer
1b4f17fafa fix buffer handling 
Originally committed as revision 6116 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-28 16:15:40 +00:00
Michael Niedermayer
ee3bc9d386 overread AV_LOG_ERROR -> AV_LOG_DEBUG 
Originally committed as revision 6111 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-27 21:45:26 +00:00
Michael Niedermayer
c0c66dd81d fix low bitrate mp3 
Originally committed as revision 6107 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-27 11:42:40 +00:00
Michael Niedermayer
39b434c6ae check the validity of the amount of the remaining bytes in the bitsteam before memcpy 
Originally committed as revision 6105 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-27 07:19:11 +00:00
Michael Niedermayer
716d73b47d unused var 
Originally committed as revision 6104 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-26 20:16:54 +00:00
Michael Niedermayer
d6bea62338 make mpa_decode_header() 10 times faster 
Originally committed as revision 6101 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-26 18:02:52 +00:00
Michael Niedermayer
731d0b1aaa another silly typo which surprisingly neither valgrind nor cmp of the file output cought 
Originally committed as revision 6100 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-26 17:29:31 +00:00
Michael Niedermayer
d37bb9d8c1 10l found by valgrind 
Originally committed as revision 6099 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-26 15:24:13 +00:00
Michael Niedermayer
06e7fb82a4 remove duplicated parser, people who pass random gibblets of the bitstream into the decoder will have to pass it through a AVParser like for all other codecs too 
remove silly internal buffering architecture (removes 1 memcpy() of the bitstream)
mp3on4 and mp3adu untested

Originally committed as revision 6098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-26 12:19:05 +00:00
Michael Niedermayer
9bffa9e7af avoid branch 
Originally committed as revision 6088 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-25 14:42:32 +00:00
Michael Niedermayer
14168ddb28 move variable declarations so that their scope is smaller 
Originally committed as revision 6087 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-25 13:58:27 +00:00
Michael Niedermayer
bc2d2757bb move the +400 out of the innermost loop 
Originally committed as revision 6086 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-25 13:46:56 +00:00
Michael Niedermayer
9b49f89cdf avoid reading exponent twice 
Originally committed as revision 6085 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-25 13:36:27 +00:00
Michael Niedermayer
1f1d675b68 reduce size of vlc table, thats slightly faster here 
Originally committed as revision 6084 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-25 12:26:34 +00:00
Michael Niedermayer
55017f35da try to avoid l3_unscale() by using a table 
Originally committed as revision 6083 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-25 11:55:20 +00:00
Michael Niedermayer
f8347c4167 replace l3_unscale(1, exponents[pos]) by LUT 
Originally committed as revision 6082 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-25 10:00:30 +00:00
Michael Niedermayer
7ca1ed0d9c maybe fixing the segfault on ARM 
Originally committed as revision 6081 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-25 02:40:52 +00:00
Michael Niedermayer
92c5cb62b0 10l typo 
Originally committed as revision 6074 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-24 12:35:53 +00:00
Michael Niedermayer
e90a72701e avoid a few if(x==0) checks in the inner loops 
Originally committed as revision 6073 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-24 11:18:41 +00:00
Michael Niedermayer
6430ce0f72 optimize reorder_block() though this function seems to be executed too rarely for this to make much difference 
Originally committed as revision 6068 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-24 08:40:09 +00:00
Michael Niedermayer
a753e55bb5 simplify 
Originally committed as revision 6067 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-24 08:39:07 +00:00
Michael Niedermayer
a08a502eda dont copy the whole GetBitContext around 
Originally committed as revision 6062 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-24 06:57:32 +00:00
Michael Niedermayer
3328ec6331 faster handling of zero coeffs in the low freq decode 
Originally committed as revision 6061 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-24 01:12:26 +00:00
Michael Niedermayer
3c693e7743 optimizing high freq decode 
Originally committed as revision 6060 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-24 01:01:39 +00:00
Michael Niedermayer
daf4cd9ac3 use memset() instead of slow c loops 
Originally committed as revision 6059 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-24 00:03:51 +00:00
Michael Niedermayer
c7aa36964e simplify 
Originally committed as revision 6058 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-23 23:40:03 +00:00
Aurelien Jacobs
acba32385b fix arm asm compilation in mpegaudiodec 
Originally committed as revision 6057 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-23 23:39:27 +00:00
Michael Niedermayer
69fd15f871 MUL* for ARM code based on a patch by Siarhei Siamashka 
untested

Originally committed as revision 6050 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-22 13:25:09 +00:00
Michael Niedermayer
f617adedc8 replace MULL with asm too, no significnat speedup but its probably better to not take any chances, some versions of gcc will almost certainly mess it up too if they can 
Originally committed as revision 6049 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-22 12:07:02 +00:00
Michael Niedermayer
47a0cd7408 replacing MULH by asm for x86 
about 30% faster imdct36()

Originally committed as revision 6048 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-22 11:51:09 +00:00
Michael Niedermayer
5ab1972b53 indent preprocessor directives 
Originally committed as revision 6047 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-22 11:16:47 +00:00
Michael Niedermayer
355903f5a8 make high precission synth filter 3 times faster on x86 
Originally committed as revision 6046 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-22 11:11:04 +00:00
Michael Niedermayer
0bd2483a75 replace MULL by MULH + shift in dct32() (code is very slightly faster, and the compiler should be able to optimize the shift away on 64bit archs) 
Originally committed as revision 6045 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-22 06:24:59 +00:00
Michael Niedermayer
eb6447766d replace a few MULL by MULH 
Originally committed as revision 6039 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-21 12:12:43 +00:00
Michael Niedermayer
120aad7fe9 reorder butterflies to reduce memory load/store 
Originally committed as revision 6037 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-20 22:18:26 +00:00
Michael Niedermayer
55582f8de3 table contains vlc with 19 bits and 8*2 < 19 
Originally committed as revision 5658 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-07 10:50:14 +00:00
Steve L'Homme
267f7edcd1 (f)printf --> av_log conversion 
taken from a patch by Steve L'Homme

Originally committed as revision 5127 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-08 11:43:10 +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
Benjamin Larsson
fb9cb0b8c4 get_vlc -> get_vlc2 transition. 
Originally committed as revision 4828 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-08 19:31:21 +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
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
Roberto Togni
d9b1c197e5 QDM2 compatible decoder 
Originally committed as revision 4649 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-10-18 20:16:43 +00:00
Roberto Togni
e6885654eb Reverse patch 1.59->1.60, it break mp3 in ffplay and ffmpeg 
Reversing approved by patch author

Originally committed as revision 4646 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-10-15 16:29:58 +00:00
Alex Beregszaszi
83254e245c removed unused CONFIG_AUDIO_NONSHORT 
Originally committed as revision 4633 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-10-12 22:37:42 +00:00
Michael Niedermayer
c26ae41db2 adding a few const 
Originally committed as revision 4337 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-06-01 21:19:00 +00:00
Michael Niedermayer
02af2269c0 check for error 
Originally committed as revision 4183 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-05 20:05:41 +00:00
Michael Niedermayer
f86f4481d8 cast to uint32 as the table is uint32_t, this also worksaround a gcc or libc bug related to frexp() 
Originally committed as revision 3997 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-02 20:46:06 +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
Roberto Togni
d2a7718df9 Multichannel mp3 in mp4 support ISO/IEC 14496-3:2001/FPDAM 3 (MP3onMP4) 
Derived from MPlayer patch by Larry Ruedisueli

Originally committed as revision 3955 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-15 20:58:32 +00:00
Michael Niedermayer
44f1698a38 merge a few shifts into the dequantization, faster and more accurate, lets hope it doesnt overflow 
Originally committed as revision 3930 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-03 03:28:27 +00:00
Michael Niedermayer
125d624610 optimizing imdct12 
Originally committed as revision 3929 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-02 22:38:28 +00:00
Michael Niedermayer
ce4a29c066 optimize antialias 
switch to integer antialias code as default as its faster now

Originally committed as revision 3925 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-02 01:37:33 +00:00
Michael Niedermayer
d04728bb57 faster, simpler and more accurate l3_unscale() 
Originally committed as revision 3924 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-01 23:43:07 +00:00
Michael Niedermayer
711ae726f7 optimizing imdct36() 
Originally committed as revision 3923 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-01 21:27:18 +00:00
Michael Niedermayer
a3a5f4d6c3 support 32bit output for the mpeg audio decoder 
Originally committed as revision 3910 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-31 12:16:21 +00:00
Michael Niedermayer
b696d2a676 more accurate dequant of near zero coefficients 
Originally committed as revision 3909 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-31 04:06:47 +00:00
Michael Niedermayer
84af4a7ee6 10l (missing overflow check) 
Originally committed as revision 3908 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-31 03:14:22 +00:00
Michael Niedermayer
093c6e50c9 10l (didnt test code after cvs up ...) 
Originally committed as revision 3904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-30 14:10:30 +00:00
Michael Niedermayer
a7a858996f dithering for the mpeg audio decoder 
Originally committed as revision 3903 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-30 14:04:56 +00:00
Alex Beregszaszi
bf1f4da01f exported ff_mpa_synth_filter for upcoming qdm2 decoder 
Originally committed as revision 3897 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-28 19:54:10 +00:00
Roberto Togni
1ede228a4f Decode MP3 in ADU format 
Originally committed as revision 3839 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-15 14:59:47 +00:00
Michael Niedermayer
2fc8ea249f dissallow sprintf 
Originally committed as revision 3823 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-12 00:59:42 +00:00
Michael Niedermayer
caa336b4cc common.c -> bitstream.c (and the single non bitstream func -> utils.c) 
common.h -> common.h/bitstream.h

Originally committed as revision 3777 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-29 17:50:25 +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
Alex Beregszaszi
491c4a1005 warning fix 
Originally committed as revision 3258 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-06-26 10:09:58 +00:00
Michael Niedermayer
53db1cae1c data_size = 0 cleanup 
Originally committed as revision 3146 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-21 14:37:16 +00:00
Michael Niedermayer
8d1f2ba5e1 static allocation rewrite (old code was plain a broken mess) 
doesnt call realloc every time
 doesnt randomly overwrite memory after after 8-16 calls
 doesnt use ugly macro wraper
 fewer lines of code

Originally committed as revision 2912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-21 21:58:14 +00:00
Michael Niedermayer
2caa92d935 fixes by Gildas Bazin <gbazin at altern dot org> 
Originally committed as revision 2745 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-04 15:49:55 +00:00
Michael Niedermayer
ac806113fe 10l 
Originally committed as revision 2726 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-01-26 19:14:02 +00:00
Steven M. Schultz
84f986c0f4 lrintf patch by ("Steven M. Schultz" <sms at 2BSD dot COM>) 
Originally committed as revision 2680 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-01-08 23:51:23 +00:00
Michael Niedermayer
a1e257b231 optimize compute_antialias() and add a floating point based alternative (2x faster) 
Originally committed as revision 2679 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-01-08 21:08:57 +00:00
Fabrice Bellard
962d6ae6c5 exported mpa_decode_header for new parser API 
Originally committed as revision 2491 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-11-10 15:21:16 +00:00
Fabrice Bellard
98ce5991d7 update sub_id in mpegaudio decoding (might need same method as MPEG2VIDEO too ?) 
Originally committed as revision 2238 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-09-08 22:49:26 +00:00
Fabrice Bellard
80783dc2c2 CODEC_ID_MP3LAME is obsolete 
Originally committed as revision 2232 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-09-08 22:04:29 +00:00
Fabrice Bellard
8c5b5683ae fixed audio frame buffering problem (should correct problems on some streams) - faster synthesis filter - prototype 'parse_only' support 
Originally committed as revision 2173 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-08-28 13:38:06 +00:00
Fabrice Bellard
228ef9dde1 memmove fixes (Jon Burgess) 
Originally committed as revision 2157 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-08-24 22:01:33 +00:00
Michael Niedermayer
a05c8d7177 merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later) 
Originally committed as revision 1690 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-18 17:22:23 +00:00
Michael Niedermayer
983e3246b7 per file doxy 
Originally committed as revision 1634 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-03-06 11:32:04 +00:00
Zdenek Kabelac
0c1a9edad4 * UINTX -> uintx_t INTX -> intx_t 
Originally committed as revision 1578 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-02-11 16:35:48 +00:00
Zdenek Kabelac
5c91a6755b * static,const,compiler warning cleanup 
Originally committed as revision 1567 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-02-10 09:35:32 +00:00
Michael Niedermayer
68f593b484 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops 
Originally committed as revision 1486 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-01-21 17:34:12 +00:00
Måns Rullgård
ef9f730675 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (Måns Rullgård)) 
Originally committed as revision 1474 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-01-19 18:30:29 +00:00
Zdenek Kabelac
855ea723b0 * two functions to handle allocation of static data more simple 
av_mallocz_static - called for every static data table
  av_free_static - called when ffmpeg is no longer needed and should free
                   all static resources
* simple usage shown in mpegaudiodec.c

Originally committed as revision 1301 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-12-03 19:40:35 +00:00
Michael Niedermayer
b587a7cb2b vc++ sucks, found by ("csharprules" <csharprules at hotmail dot com>) 
Originally committed as revision 1160 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-11-04 20:57:08 +00:00
Zdenek Kabelac
3625e88ab7 * resync without endless loop 
Originally committed as revision 849 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-08-09 10:43:02 +00:00
Michael Niedermayer
8db1a1dde0 new bitstream reader API (old get_bits() based one is emulated and will still be supported in the future cuz its simpler) 
minor optimizations to get_vlc

Originally committed as revision 725 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-07-09 10:35:10 +00:00
Falk Hüffner
20695ec921 Minor warning cleanup. 
Originally committed as revision 654 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-06-03 11:16:11 +00:00
Fabrice Bellard
8155233413 fixed layer1/2 overflow if very loud sound - fixed broken free format decoding to pass all mpeg audio standard decoding tests (please avoid patching the parser without having all test streams available - contact me if necessary) 
Originally committed as revision 634 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-06-01 14:34:29 +00:00
Zdenek Kabelac
cd4af68ad5 * started to cleanup name clashes for onetime compilation 
Originally committed as revision 617 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-27 16:42:14 +00:00
Fabrice Bellard
fad9f495c0 removed invalid buffer handling 
Originally committed as revision 604 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-26 14:41:53 +00:00
Fabrice Bellard
ff4ec49e64 license/copyright change 
Originally committed as revision 599 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-25 22:45:33 +00:00
Fabrice Bellard
59d3e367a8 fixed incorrect global gain - slightly increased precision of n^(4/3) table 
Originally committed as revision 557 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-21 21:07:47 +00:00
Fabrice Bellard
747a67fbab fixed one overflow problem 
Originally committed as revision 553 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-20 21:15:53 +00:00
Fabrice Bellard
f9ed4f8894 put all integer init code to compute n^(4/3) - memory alloc and header fixes 
Originally committed as revision 518 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-05-18 22:58:08 +00:00
Juanjo
4b1f4f236b - Versions defined for libav/libavcodec. 
- Bug fix in wav muxer for MP2 audio.
- ffmpeg/libavcodec version in MPEG-4 user data.

Originally committed as revision 400 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-04-15 02:28:05 +00:00
Juanjo
10bb7023a2 - Added force_pts to av_write_packet() to be able to force PTS, this helps 
(and fix) stream copying. By now force_pts it's just honoured by the MPEG
muxer. ASF could honour this also, but it should be fixed to use Tickers
first.
- MPEG audio decoder exports it's frame size in bytes.
- Hope this fix the floating point exception found in ffserver.

Originally committed as revision 382 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-04-07 21:44:29 +00:00
Michael Niedermayer
27a3e2c5e0 another bitstream reader code (faster on intel cpus) - patch by Michael Niedermayer <michaelni@gmx.at> 
Originally committed as revision 252 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2002-01-10 00:56:05 +00:00
Zdenek Kabelac
92d24f49f8 * fixed decoding busy loop 
Originally committed as revision 203 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2001-10-31 19:40:53 +00:00
Zdenek Kabelac
2d83f323d6 * and finaly avoid deadlock at the end of audio stream 
Originally committed as revision 183 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2001-10-23 20:20:01 +00:00
Zdenek Kabelac
de5123dc35 * fixes to avoid crash when broken mp3 header is found 
Originally committed as revision 182 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2001-10-23 19:58:30 +00:00
Zdenek Kabelac
c152c98327 * simple fix to avoid memcpy with len < 0 
Originally committed as revision 180 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2001-10-23 19:03:33 +00:00
Fabrice Bellard
239c2f4cd0 added completely new mpeg audio decoder (integer only, free format support, lsf/mpeg25 support, high/low precision support, simpler code) 
Originally committed as revision 117 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2001-09-15 22:40:28 +00:00
Fabrice Bellard
de6d9b6404 Initial revision 
Originally committed as revision 5 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2001-07-22 14:18:56 +00:00