Michael Niedermayer
03bb9ae58c
10l CODEC vs. FORMAT
...
Originally committed as revision 6687 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-13 19:19:07 +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
5523d5f41e
fix r_frame_rate detection in mpeg4 streams with non integer fps
...
Originally committed as revision 6544 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-03 19:13:27 +00:00
Michael Niedermayer
730ba4067c
fix r_frame_rate init code for groundhog.vob
...
Originally committed as revision 6345 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-26 18:34:07 +00:00
Michael Niedermayer
6c17a956b4
drop broken telecine detection code
...
Originally committed as revision 6343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-26 18:03:17 +00:00
Michael Niedermayer
35eab0c043
reindent
...
Originally committed as revision 6342 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-26 17:27:08 +00:00
Michael Niedermayer
5fb83c3844
dont ignore MAX_READ_SIZE
...
Originally committed as revision 6341 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-26 17:25:28 +00:00
Roman Shaposhnik
f5a478f65d
* Moving FifoBuffer out of libavformat/avformat.h and
...
libavformat/utils.c into libavutil
Originally committed as revision 6310 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-21 07:31:53 +00:00
Panagiotis Issaris
4ff8fcefd2
Migrate the "packetsize" OptionDef option to become an AVOption.
...
Originally committed as revision 6293 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-20 08:24:17 +00:00
Panagiotis Issaris
09a455764b
Migrate the "muxrate" OptionDef option to become an AVOption.
...
Originally committed as revision 6292 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-20 08:23:01 +00:00
Panagiotis Issaris
66acccf05f
Make OFFSET() reuse offsetof
...
Originally committed as revision 6251 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-14 13:51:54 +00:00
Panagiotis Issaris
5894991f94
Remove a redundant memset from libavformat.
...
Originally committed as revision 6250 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-14 12:04:07 +00:00
Panagiotis Issaris
8c3dd5dc9c
Use and set sane AVOption defaults
...
Patch by Takis
Original thread:
Date: Sep 8, 2006 3:26 PM
Subject: [Ffmpeg-devel] [PATCH 2/2] Use and set sane AVOption defaults
Originally committed as revision 6227 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-10 21:51:08 +00:00
Panagiotis Issaris
73a8ceaa17
make AVOptions default value field work.
...
Patch by Panagiotis Issaris % takis P issaris A uhasselt P be %
Original thread:
Date: Sep 8, 2006 3:22 PM
Subject: [Ffmpeg-devel] [PATCH 1/2] Enable usage of AVOption default value
Originally committed as revision 6224 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-10 20:21:40 +00:00
Panagiotis Issaris
5e89b50b29
undefines a few temporary defines which were not undefined after their usage.
...
Patch by Panagiotis Issaris
Originally committed as revision 6205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-09 08:49:28 +00:00
Panagiotis Issaris
ec1b10f4b9
enable setting the year and track number using AVOption
...
Patch by Takis
Original thread:
Date: Sep 6, 2006 5:43 PM
Subject: [Ffmpeg-devel] [PATCH] Enhance genre, year and track tag
support
Originally committed as revision 6196 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-08 12:28:28 +00:00
Panagiotis Issaris
57c244f6c7
makes avformat_get_context_defaults() static
...
when the next compatibility breaking change occurs, as suggested by
Michael Niedermayer here:
http://article.gmane.org/gmane.comp.video.ffmpeg.devel/36377
Patch by Takis
Original thread:
Date: Sep 8, 2006 11:19 AM
Subject: [Ffmpeg-devel] [PATCH] Make avformat_get_context_defaults static
Originally committed as revision 6195 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-08 12:12:38 +00:00
Michael Niedermayer
2c00106c2b
ignore index parameter to ignore the ODML index in avi
...
Originally committed as revision 6177 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-05 19:23:32 +00:00
Michel Bardiaux
5c07cf535f
Clarified API for numbered sequences, patch by Michel Bardiaux % mbardiaux A mediaxim P be %
...
Original thread:
Date: Aug 30, 2006 4:54 PM
Subject: [Ffmpeg-devel] [PATCH] Clarified API for numbered sequences
Originally committed as revision 6166 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-04 09:57:47 +00:00
Michael Niedermayer
504ee036ee
fix b pyramid in mp4 muxing if no dts are provided to the muxer
...
Originally committed as revision 6133 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-30 21:18:17 +00:00
Nico Sabbi
9e6c94707e
added option probesize; at the moment only used by mpegts.c
...
Originally committed as revision 6109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-27 12:21:19 +00:00
Nico Sabbi
4eb72c6b23
initial support for AVOption in AVFormatContext
...
Originally committed as revision 6108 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-27 12:14:13 +00:00
Baptiste Coudurier
81f0f93826
update documentation
...
Originally committed as revision 5985 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-11 21:24:54 +00:00
Baptiste Coudurier
f21c0b4c43
export av_interleave_packet_per_dts
...
Originally committed as revision 5984 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-11 21:21:51 +00:00
Michael Niedermayer
494bbf5805
dont be too picky about timestampsbeing wrong if the destination container is without timestamps and raw of the raw video / raw audio sort
...
Originally committed as revision 5961 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-08 20:31:19 +00:00
Michael Niedermayer
434cab9e0f
timestamp debugging av_logs()
...
Originally committed as revision 5960 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-08 19:55:32 +00:00
Reimar Döffinger
22ffac707e
Try to find out correct start time to make seeking faster and add some
...
extra checks to make sure the seeking function will not hang forever.
Originally committed as revision 5814 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-23 18:19:33 +00:00
Måns Rullgård
ff70e60176
allow individual selection of muxers and demuxers
...
Originally committed as revision 5707 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-10 21:14:37 +00:00
Måns Rullgård
d2a067d1d9
give AVInput/OutputFormat structs consistent names
...
Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-09 23:40:53 +00:00
Aurelien Jacobs
f1b163e01e
set proper bits_per_sample value for ADPCM codecs
...
Originally committed as revision 5666 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-08 07:14:00 +00:00
Baptiste Coudurier
ac3e183403
av_get_bits_per_sample and due simplifications
...
Originally committed as revision 5661 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-07 17:50:09 +00:00
Diego Pettenò
e006c307fe
Move initialisations and internal symbols in allformats.h,
...
patch by Diego "Flameeyes" Petteno flameeyes AA gentoo PP org
Original thread:
Date: Jun 30, 2006 2:07 AM
Subject: [Ffmpeg-devel] [PATCH] Move initialisations and internal symbols in allformats.h
Originally committed as revision 5556 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-30 07:41:25 +00:00
Måns Rullgård
62c52121e0
extradata may be used as bitstream reader input so allocate with padding
...
Originally committed as revision 5547 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-29 19:42:34 +00:00
Måns Rullgård
344a18c3b8
do not fail av_find_stream_info() if params for all streams could not be found
...
Originally committed as revision 5545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-29 19:02:15 +00:00
Luca Barbato
f3a30e3a9c
cleanup patch from Diego Pettenò <flameeyes@gentoo.org>
...
Originally committed as revision 5526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-25 17:37:12 +00:00
Måns Rullgård
c10824ea67
increase search limit in av_find_stream_info
...
Originally committed as revision 5505 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-20 19:46:09 +00:00
Stefan Huehner
a97c1e93aa
Add (mostly) const to variable and parameter declaration, where a char* was
...
used and 'const char*' should be, plus make some function declarations
static if they aren't used outside their declaring source file.
patch by Stefan Huehner stefan%%at%%huehner%%dot%%org
Originally committed as revision 5492 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-17 15:53:23 +00:00
Måns Rullgård
a5e9102b4b
free codec extradata in av_close_input_file
...
Originally committed as revision 5484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-16 07:54:37 +00:00
Baptiste Coudurier
47dd81c75f
make dump_format output more homogenous
...
Originally committed as revision 5483 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-15 23:26:48 +00:00
Michael Niedermayer
329b1e755e
fix probe of high bitrate mpeg2video
...
Originally committed as revision 5471 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-13 11:10:55 +00:00
Baptiste Coudurier
67dd33f90e
use av_d2q to parse frame rate
...
Originally committed as revision 5209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-24 15:47:44 +00:00
Michael Niedermayer
305ee50fbb
provide more info on which streams lack codec parameters
...
Originally committed as revision 5188 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-21 11:29:50 +00:00
Michael Niedermayer
c04c3282b4
simplify AVFormatParameters NULL checks
...
Originally committed as revision 5146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-11 00:22:21 +00:00
Michael Niedermayer
30a43f2d09
add size to AVIndex
...
Originally committed as revision 5083 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-01 11:29:55 +00:00
Michael Niedermayer
5e43b17e7c
Fix for url_fclose() being called on an already closed file based on a patch by (<Colin Ward> hitman codehq org)
...
Originally committed as revision 4980 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-11 17:17:37 +00:00
Michael Niedermayer
9f75260e68
improve fps guessing code
...
Originally committed as revision 4929 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-02 20:54:41 +00:00
Michael Niedermayer
53f7c43fcc
sanity checks for seeking
...
Originally committed as revision 4927 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-02 19:23:33 +00:00
Michael Niedermayer
a877eedce5
dynamically increase probe buffer until format is detected
...
Originally committed as revision 4920 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-02 11:27:35 +00:00
Diego Biurrun
f038fe8b4a
warning fixes by Luca Abeni, lucabe72 ##@## email ##.## it
...
Originally committed as revision 4898 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-25 22:10:13 +00:00
Gildas Bazin
ac44871c77
WinCE cross-compilation support
...
patch by Gildas Bazin < gbazin **@** altern **.** org >
Originally committed as revision 4881 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-22 18:34:17 +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
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
Michael Niedermayer
780eb1c9b9
nan fps fix
...
Originally committed as revision 4744 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-16 15:51:16 +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
31e11451f7
allow NULL write_header() and write_trailer()
...
Originally committed as revision 4675 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-11-04 23:50:11 +00:00
Michael Niedermayer
2118901192
print more time_base fps stuff if av_log level is at debug or above
...
print more likely correct fps
not sure if this is formated optimally ...
Originally committed as revision 4596 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-09-18 14:45:17 +00:00
Måns Rullgård
79396ac685
Kill some compiler warnings. Compiled code verified identical after changes.
...
Originally committed as revision 4567 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-09-06 21:25:35 +00:00
Reimar Döffinger
b461b3bc4a
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
...
Originally committed as revision 4548 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-09-02 19:16:48 +00:00
Michael Niedermayer
7cbaa7bafa
parse pict_type for streams in avi
...
fix mpeg4 parser so it outputs te pict_type
support header only parseing without repacking
Originally committed as revision 4527 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-08-15 15:58:21 +00:00
Michael Niedermayer
30bc6613fe
support fixing missing pts by parsing future frames
...
Originally committed as revision 4526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-08-15 14:22:43 +00:00
Wolfram Gloger
f0ff20a197
minor fixes for invalid audio data patch by (Wolfram Gloger: wmglo, dent med uni-muenchen de)
...
Originally committed as revision 4524 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-08-14 16:37:29 +00:00
Michael Niedermayer
9450118bc7
a few checks, seems i forgot to commit this
...
Originally committed as revision 4523 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-08-14 16:19:20 +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
Michael Niedermayer
01f4895c68
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
...
Originally committed as revision 4453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-17 22:24:36 +00:00
Michael Niedermayer
c6ec28b18c
DVB subtitle decoder by (Ian Caulfield: imc25, cam ac uk)
...
Originally committed as revision 4448 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-17 00:28:12 +00:00
Kenneth Aafløy
6fd93ce271
avformat/av_seek_frame_binary with growing file patch by (Kenneth Aafløy: kenneth, aafloy net)
...
Originally committed as revision 4423 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-08 09:14:05 +00:00
Michael Niedermayer
9c98cdbc8a
av_seek_frame() docs timestamp clarification
...
Originally committed as revision 4422 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-05 09:07:51 +00:00
Michael Niedermayer
2577897d2b
fix assertion failure
...
Originally committed as revision 4411 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-06-29 08:48:26 +00:00
Daniel Kristjansson
e36bdf8bf5
part of the 'libavformat/utils.c doxygen documentation' patch by (Daniel Kristjansson: danielk, cat nyu edu)
...
Originally committed as revision 4405 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-06-28 12:55:08 +00:00
Michael Niedermayer
43c0040a65
dont open and close codec at every call of try_decode_frame() as this is not only slow but also fails if the previous frame is needed for setting some parameters correctly
...
Originally committed as revision 4400 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-06-27 20:54:36 +00:00
Michael Niedermayer
90ad92b39d
support changing in bitstream global headers into extradata style and back
...
Originally committed as revision 4395 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-06-27 00:04:03 +00:00
Michael Niedermayer
69d93a1344
typo fix by (lists: kenneth aafloy net)
...
Originally committed as revision 4354 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-06-05 11:09:50 +00:00
Michael Niedermayer
2143116dd9
changing a few AV_LOG_DEBUG to AV_LOG_INFO
...
Originally committed as revision 4315 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-29 11:44:21 +00:00
Michael Niedermayer
2692067a45
AVPacket.pos
...
Originally committed as revision 4314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-26 20:17:12 +00:00
Michael Niedermayer
cefe0607dd
av_find_stream_info() end check fixes
...
10l (wrong time base)
use timestamps if duration isnt available
Originally committed as revision 4301 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-22 08:47:09 +00:00
Aurelien Jacobs
a965c478b2
drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
...
Originally committed as revision 4275 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-19 00:06:27 +00:00
Michael Niedermayer
1677155df8
10l (overflows)
...
Originally committed as revision 4226 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-12 16:27:05 +00:00
Michael Niedermayer
3c150d16c6
better r_frame_rate guessing code
...
Originally committed as revision 4193 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-06 23:41:47 +00:00
Michael Niedermayer
09f75b5b38
division by zero fix
...
Originally committed as revision 4191 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-06 21:11:38 +00:00
Michael Niedermayer
327c4076a3
prefer container time_base for frame duration guess
...
Originally committed as revision 4190 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-06 20:26:50 +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
Michael Niedermayer
644a92626a
PIX_FMT_NONE and related fixes
...
Originally committed as revision 4161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-25 18:29:06 +00:00
Michael Niedermayer
3ce16b30f7
discard dummy packets before doing inapropriate checks on them and failing as a result
...
Originally committed as revision 4078 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-24 01:51:57 +00:00
Michael Niedermayer
f3356e9c9e
more fine grained discarding of packets
...
Originally committed as revision 4051 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-17 01:25:01 +00:00
Michael Niedermayer
27a5fe5fdf
keyframe & non keyframe index fixes
...
Originally committed as revision 4034 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-13 00:13:01 +00:00
Michael Niedermayer
85ad569574
shorten decoder by (Jeff Muizelaar <jrmuizel gmail com>)
...
Originally committed as revision 3984 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-26 03:36:04 +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
Michael Niedermayer
a603bf8d68
dont predict missing timestamps if we lack the required information to do so
...
Originally committed as revision 3898 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-29 02:27:33 +00:00
Roine Gustafsson
888053179c
support colon-separated rates patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
...
Originally committed as revision 3892 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-27 16:11:31 +00:00
Michael Niedermayer
b9866ebcc7
support discarding uninterresting packets
...
Originally committed as revision 3860 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-22 13:36:02 +00:00
Michael Niedermayer
e19456e3ee
fixing demuxing for short files where the framerate detection failed
...
Originally committed as revision 3859 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-22 02:30:45 +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
568e18b15e
integer overflows, heap corruption
...
possible arbitrary code execution cannot be ruled out in some cases
precautionary checks
Originally committed as revision 3813 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-08 14:21:33 +00:00
Michael Niedermayer
96db7add10
10l
...
Originally committed as revision 3798 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-03 20:33:52 +00:00
Michael Niedermayer
5375644323
1/0l fix
...
Originally committed as revision 3770 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-22 01:33:04 +00:00
Michael Niedermayer
b3506cb42f
prefer integer fps if possible when guessing
...
Originally committed as revision 3769 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-21 02:27:40 +00:00
Michael Niedermayer
3e76d1b526
guess fps for the variable fps case
...
Originally committed as revision 3768 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-21 02:16:11 +00:00
Michael Niedermayer
15bc38e57c
try to guess the fps if they are variable
...
Originally committed as revision 3760 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-19 01:23:22 +00:00
Michael Niedermayer
90bb394dcc
workaround some broken mpeg-ps timestamps
...
Originally committed as revision 3755 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-15 02:36:03 +00:00
Michael Niedermayer
5edea431d0
some sanity checks on what is muxed, invalid timestamps in mpeg are very common and lead to strange errors in the mpeg muxer otherwise
...
Originally committed as revision 3752 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-14 16:19:26 +00:00
Michael Niedermayer
7984bbe2ce
fix timestamp prediction for low_delay mpeg streams
...
Originally committed as revision 3751 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-14 12:04:45 +00:00
Michael Niedermayer
d43ed92def
use pts based duration/bitrate guessing code for mpeg-ts
...
Originally committed as revision 3731 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-06 00:15:52 +00:00
Michael Niedermayer
f9a35124a7
fixing pipe seek bug
...
Originally committed as revision 3730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-06 00:08:37 +00:00
Michael Niedermayer
0d71240921
fifo_realloc()
...
Originally committed as revision 3726 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-01 02:28:28 +00:00
Michael Niedermayer
1b307febc4
fixing playback of ftp://ftp.mplayerhq.hu/MPlayer/incoming/blender_raw.avi
...
Originally committed as revision 3723 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-30 18:45:34 +00:00
Loren Merritt
f37b9768f6
split ffhuffyuv into 2 codecs:
...
"huffyuv" is compatible with the official version
"ffvhuff" contains our improvements
Originally committed as revision 3720 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-28 18:29:38 +00:00
Michael Niedermayer
dc56fc3802
int / int64 fix by (Wolfram Gloger <wmglo @@@ dent:med:uni-muenchen:de>)
...
Originally committed as revision 3704 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-23 18:23:56 +00:00
Michael Niedermayer
61c7c3e347
raw h261 demuxing fix
...
Originally committed as revision 3680 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-13 17:35:09 +00:00
Michael Niedermayer
ae214ac39e
try to guess the codec for imag2pipe too
...
Originally committed as revision 3674 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-12 22:51:52 +00:00
Michael Niedermayer
5b6d559680
move p*m from image/lavf -> image2/lavc
...
video/audio_codec_id in AVFormatParameters to override/help demuxer
av_guess_codec() to guess the default codecs based upon muxer + filename
Originally committed as revision 3668 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-11 18:09:28 +00:00
Michael Niedermayer
4eff7cf42d
porting png support from -f image to -f image2
...
Originally committed as revision 3665 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-09 23:31:46 +00:00
Michael Niedermayer
d07730ddd1
fix image stream copy
...
Originally committed as revision 3662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-08 23:36:32 +00:00
Nathan Kurz
1a1dc611ce
bug in libavformat av_update_cur_dts(), patch by (Nathan Kurz <nate at verse dot com>)
...
Originally committed as revision 3622 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-22 13:15:18 +00:00
Michael Niedermayer
5ba7c3d7c9
set keyframe flag at a more central place instead of in every demuxer for containers which only store intra only streams
...
Originally committed as revision 3620 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-22 01:51:17 +00:00
Michael Niedermayer
528c2c737e
fix assertion failure in case of timestamp discontinuities
...
Originally committed as revision 3592 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-13 23:58:28 +00:00
Michael Niedermayer
8bcb147f54
generic cur_dts update
...
removing cur_dts update code from dv again, i think its not needed
Originally committed as revision 3588 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-12 10:28:27 +00:00
Nathan Kurz
eb497825fe
default stream timebase docs patch by (Nathan Kurz <nate at verse dot com>)
...
Originally committed as revision 3581 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-11 19:42:18 +00:00
Wolfram Gloger
d0f3f15945
print start_time patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
...
Originally committed as revision 3580 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-11 17:12:52 +00:00
Michael Niedermayer
3ba1438dec
use native timebase for seeking
...
direction flag for seeking
Originally committed as revision 3577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-10 22:05:43 +00:00
Michael Niedermayer
576ae256a4
write error handling
...
Originally committed as revision 3572 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-08 20:09:52 +00:00
Michael Niedermayer
e0c91bc23b
initial dts fix
...
Originally committed as revision 3555 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-03 12:58:14 +00:00
Michael Niedermayer
7000a17542
SCR timestamp fix try #1
...
Originally committed as revision 3550 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-03 02:42:01 +00:00
Michael Niedermayer
c40a3a42e1
move free() of AVStream priv data to av_write_trailer()
...
Originally committed as revision 3548 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-01 16:30:15 +00:00
Michael Niedermayer
fe2d6fe235
move packet interleaving function into AVOutputFormat, so it can be overriden easily instead of doing reordering twice if the muxer needs some other interleaving then dts based
...
Originally committed as revision 3540 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-29 23:25:01 +00:00
Michael Niedermayer
63dd1377b3
uninitalized variables
...
Originally committed as revision 3534 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-28 21:09:25 +00:00
Michael Niedermayer
8b69867f2e
Minor Patch for shared libs on Mac OSX by (Bill May <wmay at cisco dot com>)
...
Originally committed as revision 3387 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-08-13 15:30:42 +00:00
Petr Doubek
6ba5cbc699
HTTP Authentication Patch by (Petr Doubek <doubek at vision dot ee dot ethz dot ch>)
...
tested and submitted by (Torsten Spindler <spindler at hbt dot arch dot ethz dot ch>)
Originally committed as revision 3381 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-08-12 00:09:32 +00:00
Michael Niedermayer
53e2f9caf8
ffserver fixes by (Koos Vriezen <koos.vriezen at xs4all dot nl>)
...
Originally committed as revision 3340 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-25 11:59:34 +00:00
Michael Niedermayer
03cfe134ca
image2 / image API cleanup phase-1
...
with this its possible to encode&decode any video codec to individual (1 file per frame) files
Originally committed as revision 3319 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-15 18:32:54 +00:00
Michael Niedermayer
0ff7199f59
fix first timestamp when decoding mpeg-ps
...
Originally committed as revision 3274 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-30 17:34:15 +00:00
Michael Niedermayer
6f82497728
flush audio encoder buffers at the end
...
fix vorbis in nut again
Originally committed as revision 3244 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-22 21:14:01 +00:00
Michael Niedermayer
cf7eef66ce
1000l
...
Originally committed as revision 3241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-20 11:28:01 +00:00
Wolfram Gloger
a6a92a9aa6
user specified start time offset
...
frame dup/drop info
typos
patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
Originally committed as revision 3217 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-11 22:03:16 +00:00
Michael Niedermayer
3c895fc098
correctly interleave packets during encoding
...
dts/pts fixed for streamcopy
dont use coded_frame->key_frame hack in muxers, use AVPacket.flags instead
Originally committed as revision 3171 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-29 18:50:31 +00:00
Michael Niedermayer
e928649b0b
pass AVPacket into av_write_frame()
...
fixes the random dts/pts during encoding
asf preroll fix
no more initial zero frames for b frame encoding
mpeg-es dts during demuxing fixed
.ffm timestamp scale fixed, ffm is still broken though
Originally committed as revision 3168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-29 02:06:32 +00:00
Michael Niedermayer
4fc2c6447f
100l (avi seeking)
...
Originally committed as revision 3155 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-24 15:13:23 +00:00
Michael Niedermayer
77405fc866
cur_dts in native timebase
...
Originally committed as revision 3153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-23 21:36:23 +00:00
Michael Niedermayer
cdd5034f89
store index for seeking in the native timebase of each stream
...
set correct timebase for nut
merge mpeg-ts seeking with existing seeking code
10l fix in mpegts (27mhz vs. 90khz)
Originally committed as revision 3152 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-23 16:26:12 +00:00
Michael Niedermayer
9ee91c2f53
move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
...
Originally committed as revision 3148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-21 20:43:21 +00:00
Michael Niedermayer
293ed23f12
NULL pointers ...
...
Originally committed as revision 3080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-27 02:55:05 +00:00
Michael Niedermayer
8d14a25c3e
moving nearly identical binary search code from nut/mpeg/asf to utils.c
...
Originally committed as revision 3003 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-12 16:50:03 +00:00
Michael Niedermayer
c9247fc37a
dont reduce the min_distance of AVIndexEntry
...
Originally committed as revision 2979 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-07 21:33:53 +00:00
Michael Niedermayer
b0c7f5a9d8
move zero size hack from ogg.c to utils.c
...
Originally committed as revision 2959 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-04 18:33:07 +00:00
Michael Niedermayer
6d8f985ecf
fix obnoxious ogg_packet passing from encoder to muxer
...
Originally committed as revision 2955 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-04 14:39:20 +00:00
Michael Niedermayer
8bfed902f3
remove spyware from ogg*.c
...
fix vorbis in ogg decoding
Originally committed as revision 2952 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-04 01:10:50 +00:00
Michael Niedermayer
4346539522
av_log() cleanup
...
null pointer segfaults
dont print redundant spam
dont print prefix if reference==NULL
class -> av_class
dont copy AVClass to every object, its a waste of memory and not a good idea at all
Originally committed as revision 2841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-03 17:53:55 +00:00
Michel Bardiaux
bc874daea8
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
...
Originally committed as revision 2840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-03 15:41:21 +00:00
Gildas Bazin
2092bd7531
avsync patch by (Gildas Bazin <gbazin at altern dot org>)
...
Originally committed as revision 2805 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-02-20 14:39:15 +00:00
Michael Niedermayer
3e9245a98e
store searched distance in index, so we dont waste time searching for keyframes where we already searched
...
asf seek fixes & use keyframe pos/timestamp cache
Originally committed as revision 2709 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-17 18:06:52 +00:00
Michael Niedermayer
b754978a3b
caching of timestamps for mpeg-ps so seeking is faster
...
move (av_)find_stream_index() to utils.c as its usefull outside mpeg.c
assert checking enabled, to find bugs quicker, should obviously be disabled later
(av_)add_index_entry() inserts new entries so that the list stays ordered and updates entries if already in it
(av_)index_search_timestamp() cleanup (kill ugly goto) and shorter
Originally committed as revision 2697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-13 22:02:49 +00:00
Fabrice Bellard
6ec87caa70
fixed incorrect PTS/DTS logic in MPEG video case (caused rare PTS glitches if start codes were between two PES packets)
...
Originally committed as revision 2620 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-16 11:21:25 +00:00
Fabrice Bellard
3735396022
make av_read_frame() return buffered frames at EOF
...
Originally committed as revision 2616 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-15 14:45:37 +00:00
Fabrice Bellard
8a56ac7b89
copy packet without omitting the padding
...
Originally committed as revision 2584 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-09 15:34:44 +00:00
Fabrice Bellard
bcbecff13f
fixed memory leak
...
Originally committed as revision 2525 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-20 11:22:25 +00:00
Fabrice Bellard
fb2758c83d
initial av_read_frame() and av_seek_frame() support
...
Originally committed as revision 2494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-10 18:37:55 +00:00
Fabrice Bellard
da24c5e330
make AVFMT_NOHEADER flag dynamic - added av_open_input_stream()
...
Originally committed as revision 2447 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-29 14:20:56 +00:00
Panagiotis Issaris
0bf92f7957
GCC 3.3.2 warnings patch by (Panagiotis Issaris <takis at lumumba dot luc dot ac dot be>)
...
Originally committed as revision 2440 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-26 10:49:49 +00:00
Fabrice Bellard
f71869a4db
simpler strptime - added os_support.[ch] - moved localtime_r to os_support.c
...
Originally committed as revision 2228 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-08 21:20:55 +00:00
Fabrice Bellard
4358d5def3
removed ctype.h header
...
Originally committed as revision 2225 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-08 20:04:44 +00:00
Michael Niedermayer
0a5f92a120
memory leak fix by (Tom Dexter <devel at www dot digitalaudiorock dot com>)
...
Originally committed as revision 2216 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-07 09:26:39 +00:00
Roman Shaposhnik
904736b519
1000l in abbrv. table
...
Originally committed as revision 2179 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-29 17:27:48 +00:00
Roman Shaposhnik
ba2a8cb40b
* making resolution abbreviations right
...
* introducing sntsc/spal for square pixel ntsc/pal
Originally committed as revision 2177 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-29 06:58:55 +00:00
Fabrice Bellard
22b37f5d32
suppressed frame number modulus hack - added loop_input hack which I find easier to understand
...
Originally committed as revision 2151 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-24 21:20:44 +00:00
Fabrice Bellard
00b4fdb758
win32 compile fix
...
Originally committed as revision 2139 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-24 13:59:05 +00:00
Roman Shaposhnik
c92454179d
all human-readable output should go into stderr for now. We really
...
need a generic logging facility in ffmpeg, but this will suffice for now.
Originally committed as revision 2131 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-21 21:04:19 +00:00
Fabrice Bellard
48091512c9
no default bit rate if decoding
...
Originally committed as revision 2117 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-08 18:13:43 +00:00
Fabrice Bellard
12f996edfa
initial duration/start_time generic support - displays stream duration and average total bitrate when using an input file
...
Originally committed as revision 2115 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-08 18:02:23 +00:00
Fabrice Bellard
afdd82bbf0
fix fmt == NULL case
...
Originally committed as revision 2050 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-16 07:50:17 +00:00
Fabrice Bellard
b689213642
fixed RTP/TCP client support
...
Originally committed as revision 2045 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-15 16:57:35 +00:00
Roman Shaposhnik
445f1b83ad
* First round of AV sync fixes.
...
* -r now does the right thing.
* frame rate and frame sizes now share same abbv. table and you
can do -r ntsc as well as -s ntsc
Originally committed as revision 2035 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-12 07:37:05 +00:00
Michael Niedermayer
e71ea8b251
mpeg1 bad frame_rate_base fix by (Arthur van Hoff (javanator))
...
Originally committed as revision 2012 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-04 23:08:16 +00:00
Michael Niedermayer
b530f84262
VOB stream patch ba (Brian Foley <bfoley at compsoc dot nuigalway dot ie>)
...
Originally committed as revision 1836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-05 20:47:23 +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
14bea432f1
per context frame_rate_base, this should finally fix frame_rate related av sync issues
...
Originally committed as revision 1666 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-12 15:16:19 +00:00
Michael Niedermayer
b559b29b1f
read BITMAPINFOHEADER extra stuff (huffyuv decoding fixed)
...
fixed framerate encoding & decoding hopefully, this should fix av sync on long AVIs
Originally committed as revision 1646 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-08 10:57:44 +00:00
Michael Niedermayer
2ec23b6d44
move repeat_pict field from AVCodecContext -> AVFrame (closes bug #683536 )
...
Originally committed as revision 1608 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-26 17:26:20 +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
Fabrice Bellard
6fa5a56c1b
zero copy packet handling for DV1394 by Max Krasnyansky
...
Originally committed as revision 1542 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-03 22:58:29 +00:00
Roman Shaposhnik
98486a6bc0
zero sized malloc patch by Roman Shaposhnick
...
Originally committed as revision 1501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-23 22:00:57 +00:00
Fabrice Bellard
7f172339fd
grab device is in AVFormatParameter (at least better than global variable)
...
Originally committed as revision 1499 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-23 10:33:16 +00:00
Fabrice Bellard
86fd51fbad
video_device fixes
...
Originally committed as revision 1497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-23 09:55:19 +00:00
Slavik Gnatenko
f3ec2d46ba
os2 support patch by ("Slavik Gnatenko" <miracle9 at newmail dot ru>)
...
Originally committed as revision 1447 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-11 20:34:38 +00:00
Fabrice Bellard
94d883e84b
jpeg detection fix - fixed imagepipe output
...
Originally committed as revision 1443 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-11 05:33:35 +00:00
Fabrice Bellard
87a0a6816f
added still image support
...
Originally committed as revision 1439 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-11 05:02:14 +00:00
Bill Eldridge
9b2e001fc5
mingw patch by (Bill Eldridge <bill at rfa dot org>)
...
Originally committed as revision 1347 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-12-20 19:25:10 +00:00
Philip Gladstone
c9646fda01
* Extend the syntax of a filename for the img reader to allow looping. Thus
...
%125*d means substitute the frame number MOD 125 into the filename. This
is a cheap method of having an infinite stream.
Originally committed as revision 1332 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-12-11 03:20:05 +00:00
Michael Niedermayer
492cd3a920
AVVideoFrame -> AVFrame
...
Originally committed as revision 1327 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-12-09 12:03:43 +00:00
Michael Niedermayer
1e491e29c2
cleanup
...
adding AVVideoFrame
moving quality, pict_type, key_frame, qscale_table, ... to AVVideoFrame
removing obsolete variables in AVCodecContext
skiping of MBs in b frames
correctly initalizing AVCodecContext
picture buffer cleanup
Originally committed as revision 1302 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-12-04 10:04:03 +00:00
Fabrice Bellard
abac617591
renamed libav to libavformat
...
Originally committed as revision 1276 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-25 19:07:40 +00:00