Commit Graph

272 Commits

Author SHA1 Message Date
Ivo van Poorten 91fd7398f4 typo ;)
Originally committed as revision 11287 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-21 00:22:40 +00:00
Michael Niedermayer ba66ae94a0 Document a few more structure change rules with relation to ABI/API.
Originally committed as revision 11283 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-20 09:59:07 +00:00
Michael Niedermayer 252f17e292 Document structure change rules with relation to ABI/API.
Originally committed as revision 11281 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-20 09:43:01 +00:00
Reimar Döffinger f47b9f4828 Increase minor version due to new av_close_input_stream
Originally committed as revision 11270 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-19 14:09:54 +00:00
Reimar Döffinger 2506fd5467 Add a av_close_input_stream function
Originally committed as revision 11269 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-19 14:07:13 +00:00
Michael Niedermayer 2e9b86ac12 Remove dead code which disappeared with the last major version bump.
Originally committed as revision 11268 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-19 11:31:36 +00:00
Michael Niedermayer 7195731522 Remove *_codec_id from AVFormatParameters with the next major version bump.
AVFormatParameters is never available when needed and is an annoying mess.

Originally committed as revision 11267 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-19 10:58:54 +00:00
Michael Niedermayer 626004690c Allow overriding codec_ids.
Originally committed as revision 11266 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-19 10:56:17 +00:00
Diego Biurrun 5d81d64175 cosmetics: comment typo fixes
Originally committed as revision 11232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-16 17:22:09 +00:00
Michael Niedermayer 88808c60af document how to free the result of av_alloc_format_context()
Originally committed as revision 11225 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-15 16:54:58 +00:00
Michael Niedermayer 84be6e7239 av_*_next() API for libavformat
Originally committed as revision 11206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-12 19:01:58 +00:00
Diego Biurrun 7338d36808 succes --> success typo
Originally committed as revision 11120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-01 12:05:59 +00:00
Andreas Öman fe2b276c2e Bump lavf minor due to addition of
av_url_read_fplay(), av_url_read_fpause() and av_url_read_fseek()

Originally committed as revision 11111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-28 19:51:59 +00:00
Luca Abeni 087b327287 Include os_support.h only when needed
Originally committed as revision 11073 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-21 16:33:06 +00:00
Björn Axelsson 899681cd1d Use dynamically allocated ByteIOContext in AVFormatContext
patch by: Björn Axelsson, bjorn d axelsson a intinor d se
thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007

Originally committed as revision 11071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-21 07:41:00 +00:00
Panagiotis Issaris 8ea0e80241 Fix Doxygen parameter
Originally committed as revision 11033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-15 11:45:07 +00:00
Panagiotis Issaris 4e8988a32d Typo
Originally committed as revision 11020 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-14 12:42:45 +00:00
Baptiste Coudurier 5118cae694 ogg muxer
Originally committed as revision 10999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-10 18:27:03 +00:00
Kostya Shishkov 12877faf7c Musepack SV8 demuxer and decoder
Originally committed as revision 10938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-07 05:35:46 +00:00
Kostya Shishkov 7798b42df1 Add ff_ prefix to get_v()
Originally committed as revision 10912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-03 18:29:16 +00:00
Luca Abeni c971ff1977 Remove the inclusion of rtsp.h and rtp.h from avformat.h, and
explicitly include such headers where needed

Originally committed as revision 10871 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-29 09:15:35 +00:00
Kostya Shishkov 66f7679c62 Beam Software SIFF demuxer and video decoder
Originally committed as revision 10833 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-22 06:01:38 +00:00
Kostya Shishkov fe7e750fb5 New RM format deserves small version bump
Originally committed as revision 10827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-21 17:26:02 +00:00
Nico Sabbi 526efa1053 API extension: AVProgram now has an array (stream_index) containing the indexes of the streams in AVFormatContext
Originally committed as revision 10819 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-20 08:25:13 +00:00
Diego Biurrun 5b21bdabe4 Add FFMPEG_ prefix to all multiple inclusion guards.
Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-17 09:37:46 +00:00
Benoit Fouet fe0b9a6464 Increment minor after r10709.
Originally committed as revision 10734 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-14 13:32:25 +00:00
Nico Sabbi 15afa396e4 Added definition and utility functions to handle AVProgram(s) in AVFormatContext
Originally committed as revision 10579 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-25 20:45:46 +00:00
Stefano Sabatini f94361612a Make parse_date return INT64_MIN in case of unparsable input.
Patch by Stefano Sabatini: [stefano sabatini-lala poste it]
Original thread:
[FFmpeg-devel] [PATCH] Enhace documentation forlibavformat/utils.c:parse_date
Date: 08/17/2007 09:40 PM

Originally committed as revision 10533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-19 12:38:07 +00:00
Kostya Shishkov bf4a1f17ee Monkey Audio decoder
Originally committed as revision 10484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-13 03:22:47 +00:00
Ramiro Polla ac6577cd71 Bump micro version number for r10429
Originally committed as revision 10473 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-10 19:31:03 +00:00
Neil Brown e26381b6da more verbose doxy for duration (from patch by neilb suse de)
Originally committed as revision 10136 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-18 00:35:43 +00:00
Neil Brown 4854c253a4 mention that start_time maybe AV_NOPTS_VALUE (from patch by neilb suse de)
Originally committed as revision 10135 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-18 00:31:32 +00:00
Michael Niedermayer 6d96a9b94d elaborate a little on AVStream.start_time, it seems the comment is not clear
enough, not that the clearer NEVER comment in AVFormatContext.start_time stoped
people from posting stupid patches

Originally committed as revision 10122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-16 12:07:05 +00:00
Michael Niedermayer 06c5c560ed cola for diego
Originally committed as revision 10074 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-11 20:03:10 +00:00
Diego Biurrun 68bf8d83c5 Bump minor number, NUT muxer was added.
Originally committed as revision 10072 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-11 15:03:50 +00:00
Michael Niedermayer 65d7d68b99 mention AVPROBE_PADDING_SIZE at the read_probe() doxy
Originally committed as revision 10061 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-10 16:15:23 +00:00
Luca Abeni 8767b80f5f Change avf_sdp_create() to get a pre-allocated buffer as input, and to
return an integer (0 if the SDP has been succesfully created, < 0 in case
of error)

Originally committed as revision 9947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-05 13:44:56 +00:00
Michael Niedermayer 8258354849 correct initial timestamps which have AV_NOPTS_VALUE
Originally committed as revision 9917 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-04 22:46:13 +00:00
Luca Abeni c5388c0784 Introduce an SDP generator
Originally committed as revision 9806 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-26 22:34:26 +00:00
Aurelien Jacobs 11bf3847b3 add proper support for subtitles muxing/stream copying
Originally committed as revision 9798 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-25 19:47:44 +00:00
Måns Rullgård a9fd2b1921 avoid deprecation warnings for AVFrac from avformat.h
Originally committed as revision 9569 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-09 22:15:11 +00:00
Luca Abeni bf09c2e2a6 Add support for non-blocking input formats
Originally committed as revision 9495 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-06 07:16:47 +00:00
Maksym Veremeyenko 05ce0f11e4 * clarifying the AVInputFormat::read_seek return value
* changing dv_read_seek() to return the proper value
    (patch by Maksym Veremeyenko)

Originally committed as revision 9418 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-25 02:08:04 +00:00
Måns Rullgård e46e884f25 remove old unused string functions
Originally committed as revision 9402 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-23 23:10:35 +00:00
Ramiro Polla 6fe706df05 Remove unused declarations
Originally committed as revision 9297 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-12 21:27:32 +00:00
Diego Biurrun 90b5b51eab misc typo fixes
Originally committed as revision 9291 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-12 18:50:50 +00:00
Diego Biurrun 755bfeabcc misc spelling fixes
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-12 09:29:25 +00:00
Stefano Sabatini 26ef3220cf Move the video size and rate abbreviations system from libavformat to libavcodec
patch by Stefano Sabatini: [stefano dot sabatini minus lala poste dot it]
original thread:
[FFmpeg-devel] [PATCH] Redesign the video size and rateabbreviations system
date: 06/02/2007 05:30 PM

Originally committed as revision 9288 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-12 08:06:54 +00:00
Diego Biurrun ac3967c1ce spelling
Originally committed as revision 9221 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-04 23:07:27 +00:00
Ramiro Polla 864ff8c119 Typos
Originally committed as revision 9213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-04 21:05:58 +00:00
Ramiro Polla 05abfce9a9 Doxygenize av_init_packet
Originally committed as revision 9212 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-04 20:48:04 +00:00
Ramiro Polla 659596f002 Export av_init_packet
Originally committed as revision 9211 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-04 16:52:02 +00:00
Diego Biurrun 605315248c Remove extern C declarations for C++.
FFmpeg is pure C and not all public headers have the declarations.

Originally committed as revision 9037 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-16 12:25:54 +00:00
Mark Cox 671adb1742 patch so that the deprecated items show up correctly
when building doxygen docs
patch by mark cox melbournemark plus ffmpeg minus devel chez gmail dot com

Originally committed as revision 8866 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-02 09:13:47 +00:00
Baptiste Coudurier 25406e5002 fix AVStream documentation: clarify start_time, start_time and duration are actually in stream base
Originally committed as revision 8855 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-28 13:07:52 +00:00
Aurelien Jacobs 57004ff1d7 add an enum for need_parsing
Originally committed as revision 8742 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-15 13:51:57 +00:00
Joakim Plate a74008a4c3 timestamps generation improvement when parsing avi
patch by Joakim \ elupus chez ecce dot se /
original thread:
date: 03/19/2007 01:47 AM
subject: [Ffmpeg-devel] [RFC] Improvement for the odd timestamp generation when parser is in use.

Originally committed as revision 8725 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-13 07:50:04 +00:00
Michael Niedermayer 87e8788680 allocate 32 extra bytes at the end of the probe buffer and remove most probe buf_size checks
Originally committed as revision 8677 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-08 11:34:15 +00:00
Diego Biurrun e42dba481f typos/grammar
Originally committed as revision 8641 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 14:09:20 +00:00
Kostya Shishkov 33a0dd378a DXA demuxer and decoder
Originally committed as revision 8405 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-14 14:49:49 +00:00
Panagiotis Issaris 750f0e1f8b Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
which use av_log() for logging instead of fprintf().

Originally committed as revision 8339 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-12 14:17:26 +00:00
Baptiste Coudurier ea486ab3be remove codec_info_duration/nb_frames from AVStream
Originally committed as revision 8337 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-12 10:59:47 +00:00
Panagiotis Issaris cf29452b63 Clarify doxygen description.
Originally committed as revision 8264 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-05 16:12:29 +00:00
Panagiotis Issaris 15786dc471 Cleanup doxygen comment.
Originally committed as revision 8263 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-05 16:10:05 +00:00
Panagiotis Issaris 90c07b56e0 Fix a typo in a doxygen tag.
Originally committed as revision 8262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-05 15:36:43 +00:00
Panagiotis Issaris 43d414ba2a Doxygenize the existing comments in avformat.h. The contents of the comments
were left unaltered.

Originally committed as revision 8235 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-05 00:23:23 +00:00
Panagiotis Issaris a050f80234 Correct wrong avformat documentation.
Originally committed as revision 8206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-03 19:40:03 +00:00
Panagiotis Issaris 3217cb424c Move the libavformat public API comments to avformat.h. The comments are
unmodified.

Originally committed as revision 8202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-03 12:23:20 +00:00
Ramiro Polla cc58300e30 implement new grabbing interface, as described here:
ttp://thread.gmane.org/gmane.comp.video.ffmpeg.devel/42920
patch by Ramiro Polla % ramiro A lisha P ufsc P br %
Original thread:
Date: Jan 31, 2007 8:56 PM
Subject: [Ffmpeg-devel] [PATCH] New grabbing interface

Originally committed as revision 7983 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-14 17:01:32 +00:00
François Revol 8fa36ae09d This fixes error handling for BeOS, removing the need for some ifdefs.
AVERROR_ defines are moved to avcodec.h as they are needed in there as well. Feel free to move that to avutil/common.h.
Bumped up avcodec/format version numbers as though it's binary compatible we will want to rebuild apps as error values changed.
Please from now on use return AVERROR(EFOO) instead of the ugly return -EFOO in your code.
This also removes the need for berrno.h.

Originally committed as revision 7965 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-13 18:26:14 +00:00
Reimar Döffinger c964c2c745 add key field to AVFormatContext for de/encryption support, patch by Reimar
Originally committed as revision 7924 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-11 12:37:28 +00:00
Michael Niedermayer e9b78eeba2 better generic index building and seeking code
Originally committed as revision 7841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-05 23:04:48 +00:00
Michael Niedermayer a44b3c4da8 make av_find_stream_info() duration user selectable
Originally committed as revision 7669 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-23 17:34:26 +00:00
Michael Niedermayer 6c77805fc8 get rid of the [4] limitation of codec tag lists
Originally committed as revision 7596 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 12:08:31 +00:00
Michael Niedermayer 7caf0cc62c add codec_id <-> codec_tag tables to AVIn/OutputFormat
Originally committed as revision 7593 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 01:39:17 +00:00
Reimar Döffinger 40d9c544ac Attempt to better document AVFMT_NOFILE.
Originally committed as revision 7590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-19 22:54:50 +00:00
Diego Biurrun db69c2e590 Make nb_streams unsigned to avoid an ugly cast.
Originally committed as revision 7556 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 22:31:10 +00:00
Kostya Shishkov 185c7b6b26 Musepack SV7 decoding support
Originally committed as revision 7375 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-24 04:51:43 +00:00
Måns Rullgård f27a726809 use standard INT64_MAX instead of MAXINT64 (and MIN)
Originally committed as revision 7241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-07 00:47:37 +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 89ddd2a9a5 split av_seek_frame_binary() so the code becomes idependant of AVInputFormat and AVIndex
Originally committed as revision 7035 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 01:34:36 +00:00
Michael Niedermayer e3c97c3be4 more verbose r_frame_rate definition
Originally committed as revision 6982 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-12 13:54:11 +00:00
Baptiste Coudurier f932cdf209 kill AVImageFormat
Originally committed as revision 6875 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-02 23:22:23 +00:00
Baptiste Coudurier 29f86228a0 support for Tiertex .seq files demuxing/video decoding, by Gregory Montoir %cyx A users P sourceforge P net%
Originally committed as revision 6672 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-12 12:02: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
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
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
Diego Biurrun 04d7f60143 Add official LGPL license headers to the files that were missing them.
Originally committed as revision 6219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-10 14:02:42 +00:00
Michael Niedermayer 0288a7474b AVPROBE_SCORE_MAX doc
Originally committed as revision 6206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-09 08:57:55 +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
Roman Shaposhnik 3c8f30a745 * Restructuring the division of labor between DV codec and DV format
[ Based on a patch by Brian Brice (bbrice at newtek dot com) ]

Originally committed as revision 6161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-04 03:33:11 +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 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
Michael Niedermayer 955ab9a4d8 attribute_deprecated
Originally committed as revision 6033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-20 10:42:11 +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
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