Commit Graph

2236 Commits

Author SHA1 Message Date
Corey Hickey
2e374f12b5 Don't forget about audio remaining in buffer, in case there is enough
left to make another DV frame.

Originally committed as revision 9032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-16 02:02:22 +00:00
Alex Beregszaszi
5676d140a9 initial mingw networking support
Originally committed as revision 9029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-15 14:58:30 +00:00
Baptiste Coudurier
4440b1188e simplify, no need for a function
Originally committed as revision 9008 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-12 22:17:40 +00:00
Baptiste Coudurier
54a5c7193b fix ctts index computation when seeking, check must be done against next ctts sample, thanks to Uoti
Originally committed as revision 9007 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-12 22:02:27 +00:00
Alex Beregszaszi
5f09770382 cosmetics: fix indentation
Originally committed as revision 8998 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-11 19:07:40 +00:00
Baptiste Coudurier
c3ebc833b9 dmb1 fourcc, mjpeg_opendml.mov
Originally committed as revision 8990 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10 23:42:28 +00:00
Benoit Fouet
0ba0c8debb Use url_fopen error code when opening input file
handle the AVERROR_NOENT error case in print_error

Originally committed as revision 8977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10 13:25:33 +00:00
Panagiotis Issaris
b484ec78e8 Typos
Originally committed as revision 8974 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10 10:51:00 +00:00
Luca Abeni
e4dd03f395 Reindent code after last commit
Originally committed as revision 8973 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10 10:15:15 +00:00
Limin Wang
0d6c07329e Allow avoid setting the video standard and input when capturing v4l2 video.
Patch by Limin Wang, edited by me

Originally committed as revision 8971 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10 10:14:42 +00:00
Vitor Sessak
13dec85765 RoQ muxer, patch by Vitor, vitor1001 gmail com
reference thread:
Subject: [FFmpeg-devel] [PATCH] RoQ muxer
Date: Wed, 09 May 2007 19:44:21 +0200

Originally committed as revision 8959 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-09 23:07:40 +00:00
Aurelien Jacobs
99ff31dc75 move aac and ac3 parsers in their own files
Originally committed as revision 8941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-08 23:25:31 +00:00
Ivo van Poorten
8d2fb33320 autodetect ptx files
Originally committed as revision 8938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-08 11:57:49 +00:00
Aurelien Jacobs
c0f716b86f fix display of theora videos with visible size smaller than encoded size
Originally committed as revision 8928 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-07 15:43:01 +00:00
Ivo van Poorten
cb63173785 Renderware TXD demuxer
Originally committed as revision 8927 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-07 13:30:08 +00:00
Michael Niedermayer
5fd5d0ef3a improve mpeg4-es detection by rejecting streams with reserved startcodes (fixes 11-i_need_your_love-daw.mp3 detected as mpeg4)
Originally committed as revision 8923 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-07 11:57:46 +00:00
Reimar Döffinger
89ecc26188 Fix two small typos in comment
Originally committed as revision 8920 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-06 18:23:28 +00:00
Zuxy Meng
18d915dda6 cosmetics: Fix indentation after last commit, patch by Zuxy Meng.
Originally committed as revision 8917 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-06 12:04:17 +00:00
Diego Biurrun
a4b120f32b cosmetics: Sort entries by CONFIG_ name.
Originally committed as revision 8877 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-02 22:54:28 +00:00
Daniel Cardenas
711737af8e give the position offset of the file in the packet
update seek regression test reference file accordingly
patch by Daniel Cardenas: Daniel Car cox net
original thread: [Ffmpeg-devel] [PATCH] Debug help for file position
date: 05/01/2007 02:42 AM

Originally committed as revision 8871 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-02 13:36:45 +00:00
Benoit Fouet
efd5fc538e return right format in set_codec_from_probe_data
Originally committed as revision 8867 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-02 09:18:41 +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
Zuxy Meng
d84707377f use asf stream information to set bitrate
patch by Zuxy Meng zuxy dot meng chez gmail tod com
reference thread: [Ffmpeg-devel] Third Try: Set bit_rate for asf format

Originally committed as revision 8861 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-30 15:56:11 +00:00
Wolfram Gloger
7af636d44a Fix loop condition so it can be run through more than once.
patch by Wolfram Gloger, wmglo dent.med.uni-muenchen de
reference: [Ffmpeg-devel] buffer underflow messages from the output_example.c

Originally committed as revision 8860 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-30 09:46:11 +00:00
Wolfram Gloger
268fc08290 more detailed error message for buffer underflow
patch by Wolfram Gloger, wmglo dent.med.uni-muenchen de

Originally committed as revision 8859 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-30 09:43:29 +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
Kostya Shishkov
13544287d5 Support for newer MacOSX AIFF
Originally committed as revision 8852 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-27 17:19:07 +00:00
Baptiste Coudurier
7bb7ad0eb5 fix oss audio playback, broken since r7983, pass AVFormatContext filename to audio_open since audio_device when NULL is no more set to default value
Originally committed as revision 8851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-27 16:10:05 +00:00
Alex Beregszaszi
ab7fd2c4f7 Use correct CONFIG_RTP_MUXER ifdef
Originally committed as revision 8847 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-27 01:21:11 +00:00
Alex Beregszaszi
ba472aaf01 implement ff_socket_nonblock and use it in networking code
Originally committed as revision 8846 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-27 00:41:50 +00:00
Alex Beregszaszi
8da4034f52 use ff_neterrno() and FF_NETERROR() for networking error handling
Originally committed as revision 8845 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-27 00:35:54 +00:00
Alex Beregszaszi
c08fb00016 Make protocols configure selectable and also cleanup the CONFIG_NETWORK
related parts (rtp,rtsp,sdp). Currently they are interdependent.

Originally committed as revision 8842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 23:44:56 +00:00
Alex Beregszaszi
9686292664 Don't compile RTSP_DEMUXER if not requested
Originally committed as revision 8841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 23:41:20 +00:00
Alex Beregszaszi
e7047005cb properly compile code for REDIR_DEMUXER
Originally committed as revision 8840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 23:40:36 +00:00
Diego Biurrun
4ee10633d2 cosmetics: Remove trailing whitespace and tabs.
Originally committed as revision 8838 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 19:27:32 +00:00
Diego Biurrun
c23a470800 cosmetics: sort()
Originally committed as revision 8837 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 18:31:33 +00:00
Alex Beregszaszi
383eda2348 move resolve_host from tcp.c to os_support.c as it is used widely
Originally committed as revision 8834 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 18:04:42 +00:00
Alex Beregszaszi
a33cc9511b cosmetics in resolve_host
Originally committed as revision 8833 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 18:00:28 +00:00
Alex Beregszaszi
0913873e5b remove unused rtsp_callback
Originally committed as revision 8832 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 17:38:30 +00:00
Diego Biurrun
f87462ccef proper dependency on mpegts_demuxer for rtp_muxer
Originally committed as revision 8831 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 17:35:31 +00:00
Baptiste Coudurier
b236a735e5 remove no more true comment
Originally committed as revision 8829 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 11:46:04 +00:00
Baptiste Coudurier
e23848a49c cosmectics, use consistant and homogeneous type names for atoms
Originally committed as revision 8828 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 11:36:05 +00:00
Baptiste Coudurier
f8c18cd711 use dprintf with AVFormatContext and simplify
Originally committed as revision 8827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 11:24:10 +00:00
Luca Abeni
578688fad5 Fix reading PTSs and DTSs in libavformat, by reverting r8465.
Such commit introduced some regressions (see the "Possible bug in reading
PTS/DTS" and "[BUG] no video transcoding" threads on ffmpeg-devel).

Originally committed as revision 8826 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 10:49:48 +00:00
Baptiste Coudurier
1c086afc21 remove now obsolete and no more true comments
Originally committed as revision 8824 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 08:42:21 +00:00
David Conrad
70fa2486a1 Support for seeking in TTA files.
Originally committed as revision 8820 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-25 23:22:05 +00:00
Baptiste Coudurier
8d27c5f891 add xdv2 xdcam hd tag, decode xdcam_hd_1080i60.mov
Originally committed as revision 8812 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-25 15:58:05 +00:00
Baptiste Coudurier
263a93ecff add 'wide' reversed tag in probe, detect broken xdcam files xdcam_hd_1080i60.mov
Originally committed as revision 8811 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-25 15:57:15 +00:00
Benoit Fouet
b47f86c4a3 add rgb suffix to rawvideo muxer
Originally committed as revision 8805 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-25 09:01:54 +00:00
Benoit Fouet
7d88b5ca02 more format abbreviations
Originally committed as revision 8798 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-24 11:45:13 +00:00
Baptiste Coudurier
2f8fe719c6 correct comment about seek function
Originally committed as revision 8797 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-24 10:51:26 +00:00
Diego Biurrun
a47ec310f2 Remove unused code + variable, fixes a warning.
Originally committed as revision 8794 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-24 05:50:30 +00:00
Michael Niedermayer
db2a0e229f dont assert(0) due to buggy rm demuxer
Originally committed as revision 8790 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-22 18:48:07 +00:00
Michael Niedermayer
b5a3541da1 fix av_seek_frame_generic() so that it doesnt fail if the
requested timestamp is after the last with backward flag

Originally committed as revision 8783 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-22 16:23:44 +00:00
Michael Niedermayer
b237eb800d init packet before calling the demuxer
fixed random/uninitalized AVPacket->pos

Originally committed as revision 8781 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-22 11:07:35 +00:00
David Conrad
756fb7fea1 Change from using a seek table internal to the TTA demuxer to using the standard lavf index.
Originally committed as revision 8780 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-22 00:50:36 +00:00
Baptiste Coudurier
1c02d96f6d long -> int
Originally committed as revision 8774 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-21 18:37:10 +00:00
Baptiste Coudurier
9e40addd21 cosmetics: mov_mp4 -> mp4
Originally committed as revision 8773 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-21 18:12:51 +00:00
Baptiste Coudurier
0b07ac425a clean and simplify esds reading function
Originally committed as revision 8772 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-21 18:09:14 +00:00
Baptiste Coudurier
d614f57978 remove broken ctab code
Originally committed as revision 8771 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-21 18:03:53 +00:00
Baptiste Coudurier
fa22ca2214 use INT64_MAX
Originally committed as revision 8770 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-21 18:01:47 +00:00
Alex Beregszaszi
61bc79ec9c remove possibly broken wince cruft
Originally committed as revision 8763 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-20 23:45:53 +00:00
Benjamin Larsson
10e26bc782 Atrac3 decoder.
Originally committed as revision 8747 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-17 20:53:39 +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
Diego Biurrun
cefd4907e3 Make the declaration of AVInputFormat ac3_demuxer conditional
on CONFIG_AC3_DEMUXER.

Originally committed as revision 8741 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-15 12:35:44 +00:00
Diego Biurrun
98d0205145 Move AC3 header parsing code together with the rest of the AC3 parsing code.
Originally committed as revision 8739 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-15 12:32:36 +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
Diego Biurrun
4303c9bf62 spelling
Originally committed as revision 8722 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-12 11:28:34 +00:00
John Donaghy
6fea687ec1 DVR-MS probe audio format
patch by John Donaghy \ johnfdonaghy chez gmail dot com /
Original thread:
date: 03/13/2007 04:56 PM
subject: [Ffmpeg-devel] [PATCH] DVR-MS probe audio format - was DVR-MS bug (MP2 decoding)

Originally committed as revision 8715 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-12 08:11:33 +00:00
Baptiste Coudurier
c4fe61ff87 add D-10 PAL 40 audio essence container ul
Originally committed as revision 8709 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-10 14:10:36 +00:00
Baptiste Coudurier
088e827a96 add D-10 PAL 40 ul
Originally committed as revision 8708 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-10 14:04:59 +00:00
Aurelien Jacobs
7fdcdf25a1 cosmetics: indentation
Originally committed as revision 8707 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-10 11:27:24 +00:00
Aurelien Jacobs
6207bb209e add support for seeking to a keyframe instead of a random frame
Originally committed as revision 8698 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-09 17:03:20 +00:00
Aurelien Jacobs
79f2634686 add an intermediate variable (prepare for next patch)
Originally committed as revision 8697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-09 17:00:09 +00:00
Aurelien Jacobs
cca9b6cdb3 add support for seeking in matroska files
Originally committed as revision 8696 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-09 16:48:28 +00:00
Aurelien Jacobs
df06539a25 move matroska_find_track_by_num() upper in the file
so that it can be used by other part of the code

Originally committed as revision 8695 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-09 16:45:43 +00:00
Aurelien Jacobs
67545b0ce6 cluster position is relative to segment_start
Originally committed as revision 8694 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-09 16:29:10 +00:00
Aurelien Jacobs
01344104c1 properly set streams start_time
Originally committed as revision 8693 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-09 16:27:00 +00:00
Aurelien Jacobs
8e7a7e6a01 remove unused context field
Originally committed as revision 8692 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-09 16:24:03 +00:00
Aurelien Jacobs
794857ae45 remove wrong and no more used packet reordering code
Originally committed as revision 8691 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-09 16:22:18 +00:00
Nicholas Tung
e4141433ea Get rid of unnecessary pointer casts.
patch by Nicholas Tung, ntung ntung com

Originally committed as revision 8687 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-08 20:24:16 +00:00
Stefan Huehner
119e48d960 Make some functions which aren't used outside their declaring source file
and have no prototype in a header file static.
patch by Stefan Huehner, stefan huehner org

Originally committed as revision 8686 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-08 20:21:11 +00:00
Marco Gerards
90f2a1a03c cosmetics: indentation fix
patch by Marco Gerards, mgerards xs4all nl

Originally committed as revision 8680 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-08 12:05:02 +00:00
Michael Niedermayer
ac5565d88c file extension based probe is max/2
Originally committed as revision 8679 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-08 11:37:43 +00:00
Michael Niedermayer
65a00bd65a factorize
Originally committed as revision 8678 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-08 11:37: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
Michael Niedermayer
f118d254be also remove c93_ prefix for static function in the c93 demuxer
Originally committed as revision 8676 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-08 09:50:08 +00:00
Michael Niedermayer
3e62d187ed s/rle_num_bytes/code/
shorter and correcter (its not the number of anything)

Originally committed as revision 8673 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 23:32:55 +00:00
Michael Niedermayer
f858c24fb3 simplify
Originally committed as revision 8669 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 23:26:11 +00:00
Michael Niedermayer
a7c405a48a conform to spec
Originally committed as revision 8668 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 23:24:31 +00:00
Michael Niedermayer
d7cf44899f use shorter names for the block type enum
Originally committed as revision 8664 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 23:10:22 +00:00
Michael Niedermayer
905234285d code claims to use 32bit timestamp, lets make it also use that
Originally committed as revision 8662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 22:57:04 +00:00
Michael Niedermayer
8bb57775e8 remove redundant comments
Originally committed as revision 8661 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 22:55:15 +00:00
Michael Niedermayer
955629c0e8 remove inappropriate debuging av_log() alternatively they could be changed to dprintf()
Originally committed as revision 8660 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 22:51:05 +00:00
Michael Niedermayer
373209f816 memleak (seems ive missed that under the obfuscated indention)
Originally committed as revision 8659 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 22:47:55 +00:00
Michael Niedermayer
d5c5c8b4d3 sane indention (no more 3 statements on one line...)
Originally committed as revision 8658 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 22:41:45 +00:00
Anssi Hannula
8e952e4d23 CRYO APC demuxer
patch by Anssi Hannula, anssi.hannula gmail com

Originally committed as revision 8656 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 21:34:18 +00:00
Nicholas Tung
1e6c67599e Bethsoft VID demuxer and video decoder
patch by Nicholas Tung, ntung ntung com

Originally committed as revision 8649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 20:51:58 +00:00
Marco Gerards
d1e0d21f94 THP PCM decoder, used on the Nintendo GameCube.
patch by Marco Gerards, mgerards xs4all nl

Originally committed as revision 8646 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 16:03:23 +00:00
Anssi Hannula
9a0ddd09e7 Interplay C93 demuxer and video decoder
patch by Anssi Hannula, anssi.hannula gmail com

Originally committed as revision 8643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 14:25:25 +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
Xiaohui Sun
2d99eed135 SGI image decoder ported to the new image API.
patch by Xiaohui Sun, sunxiaohui dsp.ac cn

Originally committed as revision 8635 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-06 18:29:27 +00:00
Víctor Paesa
e19fbbec95 Add some help for the analyzeduration option.
patch by Víctor Paesa, wzrlpy arsystel com

Originally committed as revision 8631 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-06 09:43:32 +00:00
Stefan Huehner
2b100ab2bf changes some function declarations from () to (void) as per ansi c.
Patch by Stefan Huehner % stefan A huehner P org %

Originally committed as revision 8625 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-04 11:51:08 +00:00
Diego Biurrun
3af6d5cf2f There were two files, libavformat/grab.c and libavformat/grab_bktr.c declaring
the video_grab_device_demuxer AVInputFormat.  Use two different names for the
AVInputFormats to reduce confusion and remove ugliness from the Makefile.

Originally committed as revision 8619 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-03 21:09:36 +00:00
Diego Biurrun
3d18b282e0 cosmetics: indentation
Originally committed as revision 8618 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-03 16:47:43 +00:00
Diego Biurrun
7b17ad84be Get rid of unnecessary conditionals.
Originally committed as revision 8617 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-03 16:33:04 +00:00
Diego Biurrun
12631f2dd0 CONFIG_NETWORK depends on CONFIG_PROTOCOLS, no need to nest conditionals.
Originally committed as revision 8615 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-03 15:59:15 +00:00
Diego Biurrun
e011ef1a85 cosmetics: Put audio (de)muxer entries in alphabetical order.
Originally committed as revision 8614 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-03 15:57:38 +00:00
Diego Biurrun
e64271c2fe Audio (de)muxer dependency on OSS is handled by configure.
Originally committed as revision 8613 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-03 15:56:21 +00:00
Diego Biurrun
ed252b1624 cosmetics: Sort list of input/output formats.
Originally committed as revision 8606 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-03 12:40:17 +00:00
Diego Biurrun
fa1ab87200 Fix copy and paste error in comment.
Originally committed as revision 8588 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-01 15:46:43 +00:00
Diego Biurrun
efb0c399ca support for the THP game format by Marco Gerards, mgerards xs4all nl
Originally committed as revision 8587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-01 14:28:48 +00:00
Michael Niedermayer
91aeec1bc7 WMVA
Originally committed as revision 8581 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-01 01:09:56 +00:00
Baptiste Coudurier
beef9ba9e2 add AVRn fourcc
Originally committed as revision 8572 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-31 16:27:22 +00:00
Diego Biurrun
30a1380a04 cosmetics: Fix indentation.
Originally committed as revision 8565 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-31 11:48:28 +00:00
Sam Hocevar
d495fdc3d3 Do not return invalid pointer for non-audio or video streams.
Patch by Sam Hocevar sam+ffmpeg zoy org

Originally committed as revision 8564 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-30 23:04:45 +00:00
Michael Niedermayer
09a628662d argh, who commited this trash
start must be 0 ...

Originally committed as revision 8563 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-30 22:10:25 +00:00
Michael Niedermayer
dc417a6e2f 10^10l to the idiot who designed this format and didnt even realize what number he used
Originally committed as revision 8562 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-30 21:59:52 +00:00
Michael Niedermayer
0c0d17f3ce fix demuxing of IMAG0002.ASF
Originally committed as revision 8558 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-30 16:20:40 +00:00
Michael Niedermayer
6cc65ab3c6 analyze end condition must match r_fps selection condition
fixes fps for Channel\ 4\ News_Channel\ 4_20_10_2006_19_00_01.dvr-ms

Originally committed as revision 8557 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-30 15:05:09 +00:00
Michael Niedermayer
e9f6c8eaae fix probe of 001.vdr-broken-6025
Originally committed as revision 8550 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-29 20:22:38 +00:00
Baptiste Coudurier
11979c460c move atom size check before parsing function search
Originally committed as revision 8546 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-29 10:45:34 +00:00
Baptiste Coudurier
a097e559b2 unset sample count to disable track when is broken
Originally committed as revision 8545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-29 10:42:22 +00:00
Baptiste Coudurier
62b6498df2 break if atom size is more than size left in container atom, fix shooter.mov
Originally committed as revision 8544 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-29 10:37:07 +00:00
Limin Wang
f5ad81f527 Allow setting v4l2 input and video standard.
Patch by Limin Wang (lance.lmwang AT gmail DOT com)

Originally committed as revision 8542 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-29 06:32:54 +00:00
Bobby Bingham
4992d8bf7d Change the vhook code to send real timestamps to the filters instead of the
current time of day, which is useless, and which the filters could just as
easily query for themselves.
patch by Bobby Bingham, uhmmmm gmail com

Originally committed as revision 8541 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-29 05:24:35 +00:00
Baptiste Coudurier
2f124d2af2 add hdv1 fourcc
Originally committed as revision 8540 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-28 15:45:24 +00:00
Baptiste Coudurier
0b339acb9e revert r8538 (set bit rate for asf format) until regression tests issue is stated
Originally committed as revision 8539 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-28 14:48:42 +00:00
Zuxy Meng
4d38ebfd7b set bit rate for asf format, patch by Zuxy Meng, zuxy meng gmail com
Originally committed as revision 8538 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-28 12:03:37 +00:00
Michael Niedermayer
7975048628 require at least a score of AVPROBE_SCORE_MAX/4 or reaching of PROBE_BUF_MAX
to detect a container
fixes probing of mpeg_probe_fail.mpg

Originally committed as revision 8535 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-27 19:28:40 +00:00
Baptiste Coudurier
bad0cefbdd add IJPG fourcc, to play m_ijpg.avi
Originally committed as revision 8530 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-26 18:41:12 +00:00
Michael Niedermayer
61f676e1c1 warning about vhooks status
Originally committed as revision 8529 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-26 18:01:26 +00:00
Baptiste Coudurier
c59f24e657 activate parser on MP3 id, fix [A-Destiny]_Konjiki_no_Gash_Bell_-_65_[71EE362C].mp4
Originally committed as revision 8516 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-25 15:15:35 +00:00
Baptiste Coudurier
0174f51470 prefer MP3 id
Originally committed as revision 8515 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-25 15:12:27 +00:00
Baptiste Coudurier
db6d109da2 use MKTAG
Originally committed as revision 8513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-25 15:09:02 +00:00
Baptiste Coudurier
b0c17f7776 dont fail immediately when a somehow broken track is detected, some tracks might be good, fix mi2_vorbis51.mp4
Originally committed as revision 8512 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-25 15:06:50 +00:00
Aurelien Jacobs
8509fc7b13 add support for V_THEORA into Matroska
Original thread:
Date: Thu, 22 Mar 2007 20:23:08 -0400
Subject: [Ffmpeg-devel] [PATCH] Theora in MKV (GSoC '07 Qualification)

Originally committed as revision 8507 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-25 01:11:00 +00:00
Baptiste Coudurier
ccba88d764 cosmectics, mov -> mp4
Originally committed as revision 8497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-24 15:24:36 +00:00
Baptiste Coudurier
295b7dc367 sort
Originally committed as revision 8496 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-24 15:17:30 +00:00
Baptiste Coudurier
2b4162f0ae add some codec object type ids
Originally committed as revision 8495 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-24 15:16:03 +00:00
Baptiste Coudurier
b41899c66c prefer MP3 id as mentioned in avcodec.h line 210
Originally committed as revision 8494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-24 15:11:47 +00:00
Baptiste Coudurier
7555d2e633 add specifications reference comments
Originally committed as revision 8493 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-24 15:10:12 +00:00
François Revol
c9fdab0dab Some more BeOS cleanup: check for arpa/inet.h; declare the prototype for inet_aton if not found; remove barpainet.h as it's not longer needed.
Originally committed as revision 8488 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-23 22:01:37 +00:00
David Conrad
8076609a40 The NSV demuxer assumes that a video frame's timestamp increases by one on each
frame, but some low-bitrate NSV files omit video frames for some NSV frames,
and expect the timestamp to increase by one every NSV frame. This is noticeable
in 64vp3.nsv where the video runs several times faster than the audio. Fix this
by unconditionally incrementing the video's timestamp with each NSV frame.
patch by David Conrad, umovimus gmail com

Originally committed as revision 8466 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-21 11:05:35 +00:00
Wolfram Gloger
df7625ed62 av_estimate_timings_from_pts() flushes the packet queue but doesn't
reset the streams' cur_dts values.  This can lead to a fatal "error,
non monotone timestamps ..." message later, because the out-of-date
cur_dts values are used to compute some packet's dts.

Fix this by calling av_read_frame_flush() and eliminate code
duplication in the process.

The additional hunk gives more detailed error messages.

patch by Wolfram Gloger, wmglo dent.med.uni-muenchen de

Originally committed as revision 8465 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-21 10:48:10 +00:00
Baptiste Coudurier
e14f79ed37 cosmetics, sample_size_v1 -> bytes_per_frame / samples_per_frame
Originally committed as revision 8464 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-21 10:28:03 +00:00
Baptiste Coudurier
638fd2fce7 cosmetics
Originally committed as revision 8463 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-21 10:19:37 +00:00
Baptiste Coudurier
2d2432b738 set audio frame size based on stts
Originally committed as revision 8462 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-21 10:17:52 +00:00
Baptiste Coudurier
4278662d45 treat frame_size > 1 as compressed audio
Originally committed as revision 8461 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-21 10:03:27 +00:00
Michael Niedermayer
028d6f3e71 revert r8428, the check was not that useless
should fix constant pts=0 with broken demuxers

Originally committed as revision 8454 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-20 13:59:59 +00:00
Michael Niedermayer
a843d1ff32 i think this is more correct
Originally committed as revision 8452 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-20 13:01:39 +00:00
Luca Barbato
bd03c380ce expose av_base64_decode and av_base64_encode
Originally committed as revision 8448 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-19 00:48:47 +00:00
Clemens Ladisch
559fd1e795 fix end-of-file detection
At the end of a nut file, the check for url_feof() fails because the
eof flag was cleared by the url_fseek() call that was used to skip over
the index packet.    This patch fixes this
patch by: Clemens Ladisch % cladisch A fastmail P net %
Original thread:
Date: Feb 27, 2007 6:13 PM
Subject: [Ffmpeg-devel] [PATCH] nutdec: fix end-of-file detection

Originally committed as revision 8447 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-18 23:59:56 +00:00
Baptiste Coudurier
c06136e024 add dnxhd fourcc
Originally committed as revision 8446 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-18 23:29:40 +00:00
Justin Ruggles
f8b9830b6c improve ac3_probe by counting consecutive frames
Originally committed as revision 8441 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-18 19:32:22 +00:00
Diego Pettenò
642d4a1a16 Remove parameter unused in format string.
Patch by Diego Petten [flameeyes gentoo org]

Originally committed as revision 8438 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-18 09:49:25 +00:00
Michael Niedermayer
bc4efe42dd remove incorrect special case for audio
Originally committed as revision 8433 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-17 14:44:22 +00:00
Michael Niedermayer
7e4baa66e0 fix indention
Originally committed as revision 8432 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-17 14:29:00 +00:00
Michael Niedermayer
d9e1efb7f8 reorder pts into dts support
Originally committed as revision 8431 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-17 14:27:01 +00:00
Michael Niedermayer
a7f7965a27 remove useless if()
Originally committed as revision 8428 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-17 02:23:53 +00:00
Michael Niedermayer
14eb3345ba simplify
Originally committed as revision 8427 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-17 02:03:59 +00:00
Michael Niedermayer
41c8a56a14 simplify
Originally committed as revision 8426 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-17 01:21:40 +00:00
Michael Niedermayer
e25f97313f remove silly video check, theres nothing video specific in there
Originally committed as revision 8425 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-16 23:02:33 +00:00
Michael Niedermayer
befe3b05d3 add a delay variable to hold the timestamp buffer size
set cur_dts correctly for delay>1

Originally committed as revision 8424 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-16 22:59:45 +00:00
Michael Niedermayer
741887cf3e remove special case for h.264 whatever this was supposed to do its not correct
Originally committed as revision 8423 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-16 22:31:57 +00:00
Aurelien Jacobs
262e2bee24 disable pts reordering code and initialize a parser instead
Originally committed as revision 8418 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-15 23:08:58 +00:00
Bobby Bingham
2c0c00cb14 Targa (.tga) encoder,
patch by Bobby Bingham % uhmmmm A gmail P com %
Only handles 24-bit BGR and 8-bit grayscale, no RLE at the moment either.
Original thread:
Date: Mar 11, 2007 7:58 PM
Subject: [Ffmpeg-devel] [PATCH] Targa encoder

Originally committed as revision 8411 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-15 12:23:08 +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
Aurelien Jacobs
5ae4975c65 remove outdated comment
Originally committed as revision 8370 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-13 00:21:19 +00:00
Aurelien Jacobs
2b1785b7cc remove no more needed parameters
Originally committed as revision 8369 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-13 00:20:18 +00:00
Aurelien Jacobs
086b0ad8ca set pkt->duration for laced packets too
Originally committed as revision 8366 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-13 00:16:31 +00:00
Aurelien Jacobs
9b54ab15e7 calculate pts for laced packets
Originally committed as revision 8365 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-13 00:10:52 +00:00
Aurelien Jacobs
7fde6331a7 calculate default_duration for AAC tracks
Originally committed as revision 8364 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-13 00:02:55 +00:00
Aurelien Jacobs
25f2b76fdb scale duration and default_duration
Originally committed as revision 8363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-13 00:01:24 +00:00
Aurelien Jacobs
916bf03a69 move timecode calculation out of laces loop
Originally committed as revision 8359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-12 21:58:29 +00:00
Baptiste Coudurier
3679f65946 remove wrong avid imx ntsc fourcc
Originally committed as revision 8350 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-12 17:43:36 +00:00
Ronald S. Bultje
ecb4a895b2 Properly initialize filesize during input buffer initialization.
patch by Ronald S. Bultje, rbultje ronald.bitfreak net

Originally committed as revision 8343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-12 14:51:18 +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
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
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
Aurelien Jacobs
ded669f836 cosmetic: indent after last commit
Originally committed as revision 8335 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-11 23:44:13 +00:00
Aurelien Jacobs
ac9073c926 reorder pts of packets from tracks using V_MPEG* codecs
Originally committed as revision 8334 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-11 23:40:57 +00:00
Aurelien Jacobs
3d20538d07 revert r7181
This was a stupid mistake. We already take care of time_scale
in av_set_pts_info().

Originally committed as revision 8333 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-11 23:19:27 +00:00
Aurelien Jacobs
6bed20f45a check if current block contains a B frame and gives this info to parse_block()
Originally committed as revision 8332 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-11 23:05:01 +00:00
Aurelien Jacobs
4d41f3eea0 extract ebml_read_binary() out of matroska_parse_block()
This allows to read all the blockgroup parameters before
parsing the block itself.

Originally committed as revision 8331 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-11 22:54:15 +00:00
Aurelien Jacobs
12f3278dc5 reindent after last commit
Originally committed as revision 8330 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-11 22:28:03 +00:00
Aurelien Jacobs
0fb7a2b9bf parse clusters until some packets are queued
instead of parsing only one cluster

Originally committed as revision 8329 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-11 22:26:39 +00:00
Aurelien Jacobs
0f3bd8ce1b fix a stupid bug in ebml_read_sint()
Originally committed as revision 8328 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-11 22:19:02 +00:00
Aurelien Jacobs
912c94f3ff use codec_get_id() instead of deprecated codec_get_[bmp/wav]_id()
Originally committed as revision 8327 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-11 22:16:38 +00:00
Michael Niedermayer
09d9672ad6 fix gsize=0 / -1 case (if(<24) goto fail) before it is not a good idea
Originally committed as revision 8320 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-11 03:36:17 +00:00
Michael Niedermayer
e1315fb160 some url_is_streamed()==1 related fixes
Originally committed as revision 8319 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-11 02:51:06 +00:00
Michael Niedermayer
755c18ae5d fix demuxing of broken MVI_3011.avi
Originally committed as revision 8317 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-10 19:30:59 +00:00
Oded Shimon
1017fafb20 remove usage of deprecated functions in libnut.c (codec_get_id/tag)
Originally committed as revision 8316 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-10 18:39:58 +00:00
Oded Shimon
0020596f92 Add doxygen file header to libnut.c
Originally committed as revision 8315 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-10 18:34:15 +00:00
Michael Niedermayer
140fba0985 jpeg fourcc
Originally committed as revision 8310 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-10 11:30:48 +00:00
Baptiste Coudurier
dc13d0b5ae seems safer to set pts timebase to sample rate, fix some mp3
Originally committed as revision 8300 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-08 22:14:04 +00:00
Baptiste Coudurier
b912ef3fc9 fix pts handling
Originally committed as revision 8299 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-08 21:29:38 +00:00
Michel Bardiaux
bdb4b698d8 Corrections so that builds with DEBUG work
Originally committed as revision 8295 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-08 14:49:43 +00:00
Alex Beregszaszi
3caa0d9343 move preroll_time from static variable into definition, might be a good idea moving this into the context and making user-settable
Originally committed as revision 8278 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-07 02:03:32 +00:00