generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
20,881 Commits 24 Branches 241 Tags 173 MiB
f331cec47d
Commit Graph

466 Commits

Author SHA1 Message Date
Aurelien Jacobs
bc718b4720 fix missed usage of old metadata API in mov demuxer 
Originally committed as revision 17689 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-01 16:06:26 +00:00
Benoit Fouet
f3592353ce Add a context to av_log() call. 
Originally committed as revision 17638 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-27 08:31:20 +00:00
Baptiste Coudurier
bc64cb9680 check av_get_packet return value 
Originally committed as revision 17514 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-22 01:07:46 +00:00
Baptiste Coudurier
0d8f0abfb9 return AVERROR(ENOMEM) if alloc failed, set count after alloc, use variable when reallocing, based on patch by Netgem 
Originally committed as revision 17509 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-22 00:20:07 +00:00
Aurelien Jacobs
54b4ea57fd demux some more metadata tags in mov 
Originally committed as revision 17321 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 14:13:28 +00:00
Aurelien Jacobs
49674dd052 use new metadata API in mov demuxer 
Originally committed as revision 17309 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 02:28:54 +00:00
Baptiste Coudurier
5b4f5e5dff fix frame size, time rate is not stts duration anymore with time offset 
Originally committed as revision 17162 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-11 21:11:19 +00:00
Baptiste Coudurier
fcdd622cfc do not set start time to 0, it is not the case with elst time offset 
Originally committed as revision 17161 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-11 20:19:35 +00:00
Baptiste Coudurier
a5929abe7a adjust time rate according to elst time offset 
Originally committed as revision 17146 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-11 02:32:39 +00:00
Baptiste Coudurier
4c125b8f6e fix compilation with DEBUG defined, field does not exist anymore 
Originally committed as revision 17115 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-10 02:27:26 +00:00
Baptiste Coudurier
04e06cfa20 cosmetics: sample_to_chunk -> stsc 
Originally committed as revision 17054 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 09:59:31 +00:00
Baptiste Coudurier
a234e38d6e cosmetics: sample_to_ctime -> ctts 
Originally committed as revision 17053 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 09:57:28 +00:00
Baptiste Coudurier
1975c52c2a remove useless field 
Originally committed as revision 17052 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 09:55:23 +00:00
Baptiste Coudurier
425c9962b2 fix doxygen 
Originally committed as revision 17049 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 09:39:19 +00:00
Stefano Sabatini
8e2fd8e1d4 Replace the calls to the deprecated av_alloc_format_context() with 
corresponding calls to avformat_alloc_context().

Originally committed as revision 17048 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 08:27:26 +00:00
Baptiste Coudurier
baf2ffd329 offset dts according to edit list, hackish but works, based on patch by Reimar 
Originally committed as revision 17037 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 04:27:07 +00:00
Baptiste Coudurier
bf252f7f6f prevent reading more than container atom size, fix broken file broken_by_rev15830.MOV, fix #818 
Originally committed as revision 16979 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-03 23:03:41 +00:00
Baptiste Coudurier
8dc81a4524 seek at 0 when timestamp requested is negative 
Originally committed as revision 16815 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-27 04:29:33 +00:00
Aurelien Jacobs
dce25564cc 'code' is used to index a table so make it unsigned 
this prevents using negative index and possibly crashing with broken files

Originally committed as revision 16714 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-21 22:32:17 +00:00
Baptiste Coudurier
f53ee31275 change sample aspect ratio test to be more clear, print old one 
Originally committed as revision 16703 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-20 21:06:57 +00:00
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences. 
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-19 15:46:40 +00:00
Aurelien Jacobs
9ce6c13879 export gcd function as av_gcd() 
Originally committed as revision 16653 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-17 11:13:33 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +00:00
David Conrad
6cdbff63cd Use the dimensions in tkhd for timed text tracks 
Originally committed as revision 16561 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 23:24:28 +00:00
Diego Biurrun
6a5d31ac25 Fix build: Add intreadwrite.h and bswap.h #includes where necessary. 
Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 22:19:48 +00:00
Baptiste Coudurier
64d50fa551 move ffindex set before mov_read_default so it can be used in functions 
Originally committed as revision 16548 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 21:04:25 +00:00
David Conrad
58e9f2edb6 Read extradata (justification, colors, fonts, etc) for mov/mp4 timed text 
Originally committed as revision 16530 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 08:24:44 +00:00
Baptiste Coudurier
fa50a0276f only set le if value is 1, fix boom5.mov, issue #770 
Originally committed as revision 16507 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-09 22:13:37 +00:00
Baptiste Coudurier
364df7b7b9 cosmetics, remove useless parenthesis and whitespaces 
Originally committed as revision 16213 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-18 09:18:43 +00:00
Baptiste Coudurier
a15328249d set alac channels from extradata, fix alac mono in m4a 
Originally committed as revision 16212 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-18 09:17:19 +00:00
Baptiste Coudurier
271344377a check that nb_streams is valid before setting stream, fix crash with jp2 which do not use same structure 
Originally committed as revision 16166 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 08:47:28 +00:00
Baptiste Coudurier
6da5407401 parse pasp atom and set sample aspect ratio, 
warn if transformation matrix differs from pasp,
based on a patch by Skal.

Originally committed as revision 16066 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 22:24:56 +00:00
Baptiste Coudurier
c3e92a6cb4 remove _t in typedef for POSIX compatibility 
Originally committed as revision 16063 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 20:06:56 +00:00
Kenan Gillet
73b458e354 Commit last ok'ed parts of QCELP decoder and enable it. 
patch by Kenan Gillet, kenan.gillet gmail com

Originally committed as revision 15978 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-02 16:48:05 +00:00
Kenan Gillet
061f407e53 More OKed parts of the QCELP decoder 
patch by Kenan Gillet, kenan.gillet gmail com

Originally committed as revision 15975 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-01 22:07:00 +00:00
Baptiste Coudurier
12e416c848 decrease atom size, fix broken files missing version/flags 
Originally committed as revision 15872 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-18 09:09:57 +00:00
Baptiste Coudurier
51c1520114 read itunes metadata, code based on Reimar's patch 
Originally committed as revision 15840 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-16 01:59:35 +00:00
Baptiste Coudurier
86b0affd08 simplify metadata reading 
Originally committed as revision 15830 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-15 20:17:19 +00:00
Baptiste Coudurier
5b9ce252a9 10l, fix amrwb sample rate 
Originally committed as revision 15562 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-04 23:30:35 +00:00
Baptiste Coudurier
f06188d5ee set sample rate for amr to allow stream copy since no decoder is present, 
3gp does not store sample rate in stsd in fact. Fixes #674.

Originally committed as revision 15536 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-03 19:37:41 +00:00
Diego Biurrun
bc5c918ea8 Remove offset_t typedef and use int64_t directly instead. 
The name offset_t is easily confused with the standard off_t type and
*_t is POSIX reserved namespace if any POSIX header is included.

Originally committed as revision 15533 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-03 10:16:29 +00:00
Diego Pettenò
fb65d2ca84 Use enum typers instead of int. 
Patch by Diego 'Flameeyes' Pettenò: flameeyes gmail

Originally committed as revision 15517 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-02 16:03:00 +00:00
Baptiste Coudurier
0c5f76f708 support negative ctts in some way, unset wrong dts 
Originally committed as revision 15468 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-30 02:44:57 +00:00
Baptiste Coudurier
4e240985d8 stop parsing if tag size is wrongly < 8 to avoid infinite loop 
Originally committed as revision 15401 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-24 18:55:00 +00:00
Baptiste Coudurier
aeb627888d merge amr wb case with amr nb and qcelp 
Originally committed as revision 15399 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-24 17:17:11 +00:00
Baptiste Coudurier
26f5e1469f do not override sample rate for amr nor qcelp, should fix some qcelp files at 16000hz 
Originally committed as revision 15397 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-24 17:09:59 +00:00
Luca Abeni
dd1c8f3e6e Bump Major version, this commit is almost just renaming bits_per_sample to 
bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!

Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-08 14:24:59 +00:00
Baptiste Coudurier
3a25c707fa remove vorbis dec hack, decoding will be done anyway to get frame size 
Originally committed as revision 15035 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-29 20:04:28 +00:00
Aurelien Jacobs
5972945197 convert every muxer/demuxer to write/read sample_aspect_ratio from/to 
the corresponding AVStream instead of AVCodecContext

Originally committed as revision 14933 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-23 23:43:20 +00:00
Baptiste Coudurier
7e4b3fb878 enable fl32/64 le/be in mov with stsd audio v2 
Originally committed as revision 14919 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-23 15:25:38 +00:00
Peter Ross
a1ef2c4bb3 Make MOV demuxer handle F32BE, F32LE, F64BE and F64LE PCM audio. 
Originally committed as revision 14836 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-19 11:00:40 +00:00
Baptiste Coudurier
021b8ae39b fix if/else case 
Originally committed as revision 14526 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-03 21:24:30 +00:00
Baptiste Coudurier
2288834f87 full lpcm support in mov audio stsd v2 
Originally committed as revision 14524 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-03 18:37:35 +00:00
Baptiste Coudurier
aaef2bb345 support big endian lpcm with audio stsd v2 
Originally committed as revision 14507 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-02 03:45:23 +00:00
Baptiste Coudurier
6b477e1b71 keep original codec/fourcc endianness, fix XDCAMHD.mov 
Originally committed as revision 14506 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-02 03:43:36 +00:00
Baptiste Coudurier
9184d53a03 more complete audio stsd v2 
Originally committed as revision 14505 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-02 03:40:13 +00:00
Baptiste Coudurier
5ef3ad59f2 move version specific parsing code before codec specific code, will be needed 
Originally committed as revision 14504 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-02 03:35:43 +00:00
Art Clarke
138568e9da downgrade mov negative ctts log message to warning, patch by Art Clarke, aclarke at vlideshow dot com 
Originally committed as revision 14492 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-31 19:44:42 +00:00
John Schmiederer
ec072669f7 Use tkhd matrix for proper display in mov. 
Patch by John Schmiederer jschmiederer on2 com
Original thread: [PATCH] Use tkhd matrix for proper display in mov
Date: 05/23/2008 09:31 PM

Originally committed as revision 14365 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-24 07:55:11 +00:00
Baptiste Coudurier
5469b788ea cosmetics, remove space 
Originally committed as revision 14273 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-18 00:24:31 +00:00
Baptiste Coudurier
40e7aaa384 Return max score when ftyp atom is encountered. 
Originally committed as revision 14272 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-18 00:23:37 +00:00
Baptiste Coudurier
d4fdba0df7 chinese avs demuxing support, demux AVSFileFormat.mp4 
Originally committed as revision 13899 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-22 23:52:57 +00:00
Baptiste Coudurier
ade8d8b939 uniformize AVStream->priv_data freeing in av_close_input_stream 
Originally committed as revision 13838 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-20 17:22:56 +00:00
Art Clarke
e3ec60d82a free private streamcontext when closing demuxer, fix memory leak, patch by Art Clarke, aclarke at vlideshow dot com 
Originally committed as revision 13800 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-18 08:30:50 +00:00
Stefano Sabatini
bde15e74de Make long_names in lavf/lavdev optional depending on CONFIG_SMALL. 
patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me

Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-03 16:20:54 +00:00
Baptiste Coudurier
391872e467 aac chan config is 0 if bitstream contains program_config_element 
Originally committed as revision 13437 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 21:52:54 +00:00
Albert Astals Cid
6f04eb1e8a free moov and cmov when error occurs, fix memleak, patch by Albert Astals Cid, aastals at tv-wan dot es 
Originally committed as revision 13237 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-22 17:16:12 +00:00
Baptiste Coudurier
585dac65db only print debug info when sample is actually added 
Originally committed as revision 13202 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-20 02:24:02 +00:00
Baptiste Coudurier
285a3da9bd warn about multiple fourcc 
Originally committed as revision 13201 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-20 02:22:44 +00:00
Baptiste Coudurier
978677a779 demux all stsd ids if codec is the same, fix premature_mov_ending.mov, closes #451 
Originally committed as revision 13200 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-20 02:21:29 +00:00
Diego Biurrun
245976da2a Use full path for #includes from another directory. 
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-09 11:56:36 +00:00
Henrik Gulbrandsen
e8430214c3 set pkt duration, only when dts == pts though, 
patch by Henrik Gulbrandsen henrik at gulbra dot net

Originally committed as revision 13003 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-26 17:51:02 +00:00
Baptiste Coudurier
eb034aca18 yes it is true for mp4 
Originally committed as revision 12972 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 16:52:30 +00:00
Baptiste Coudurier
43612ffe25 remove unneeded variable 
Originally committed as revision 12971 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 16:50:06 +00:00
Baptiste Coudurier
baf9fb32c0 move vars decls where vars are used 
Originally committed as revision 12970 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 16:47:22 +00:00
Baptiste Coudurier
45a97d3018 set channels and sample rate from mpeg4audio config 
Originally committed as revision 12964 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 14:09:42 +00:00
Baptiste Coudurier
1dec399449 parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files 
Originally committed as revision 12961 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 14:03:28 +00:00
Baptiste Coudurier
69b1c62756 update doc 
Originally committed as revision 12960 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 13:56:08 +00:00
Baptiste Coudurier
7e6273322c error is -1 
Originally committed as revision 12959 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 13:54:33 +00:00
Baptiste Coudurier
cfb5a2abcb cosmetics 
Originally committed as revision 12958 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 13:45:46 +00:00
Baptiste Coudurier
47e1d7efce move vars decls where vars are used 
Originally committed as revision 12957 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 13:44:34 +00:00
Baptiste Coudurier
8cd92bb915 parser should not be needed anymore, merge cases and set frame size for amr too 
Originally committed as revision 12956 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 13:34:51 +00:00
Baptiste Coudurier
3b8c000d1e lower frame size to split amr/qcelp/gsm frames 
Originally committed as revision 12954 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 13:24:25 +00:00
Baptiste Coudurier
37ffe34bf3 align and remove useless braces 
Originally committed as revision 12952 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 12:02:01 +00:00
Baptiste Coudurier
1c126b4f38 cosmetics, remove whitespaces in tags 
Originally committed as revision 12951 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 11:57:39 +00:00
Baptiste Coudurier
cc326d2bf3 set gsm default frame size and bytes per frame, needed by old qt format, fix sample-gsm-8000.mov 
Originally committed as revision 12950 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-25 10:35:06 +00:00
Baptiste Coudurier
3f78a3a955 demux qcelp, so this can work with soc decoder and stream copy 
Originally committed as revision 12941 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-24 17:17:41 +00:00
Baptiste Coudurier
be51192502 set alac frame size from extradata 
Originally committed as revision 12937 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-24 13:58:22 +00:00
Michael Niedermayer
7344dac4ad Fix probe for mov00003.mqv. 
Originally committed as revision 12833 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-15 12:25:03 +00:00
Baptiste Coudurier
0265fe81e4 remove cast 
Originally committed as revision 12757 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-05 12:47:56 +00:00
Baptiste Coudurier
612b5cbb24 better error message 
Originally committed as revision 12756 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-05 12:46:59 +00:00
Baptiste Coudurier
5e788d588b support mp4 fragmented files without any samples in the moov atom 
Originally committed as revision 12635 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-30 21:15:06 +00:00
Baptiste Coudurier
44e43aab03 check frag track id before setting st 
Originally committed as revision 12634 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-30 20:49:29 +00:00
Baptiste Coudurier
5610f20ed4 gsm in mov, demux surge-1-16-B-agsm.mov 
Originally committed as revision 12621 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-28 16:30:22 +00:00
Baptiste Coudurier
9e81a0ce00 print essence path in error message 
Originally committed as revision 12607 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-27 13:30:31 +00:00
Baptiste Coudurier
9ce84dd8b4 cosmetics, useless braces 
Originally committed as revision 12606 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-27 13:20:12 +00:00
Baptiste Coudurier
6282c5f45b print stream index in error message 
Originally committed as revision 12605 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-27 13:19:19 +00:00
Baptiste Coudurier
71f3623510 according to specs, only color table id set to 0, have it in stsd, fix 4colors.mov 
Originally committed as revision 12604 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-27 13:16:29 +00:00
Baptiste Coudurier
d3bc61ac75 Only use chunk demuxing for old uncompressed audio mechanism specified by stts. 
This will split amr/aac cbr samples correctly in isom files which do not
set audio cid to -2.

Originally committed as revision 12603 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-27 12:35:22 +00:00
Diego Biurrun
d952638699 typo: occured --> occurred 
Originally committed as revision 12549 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-22 01:06:57 +00:00