Commit Graph

306 Commits

Author SHA1 Message Date
Baptiste Coudurier
23d2cfe9a5 remove useless seek
Originally committed as revision 11236 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-16 18:10:52 +00:00
Baptiste Coudurier
01eeb422fd cosmetics
Originally committed as revision 11235 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-16 18:10:18 +00:00
Baptiste Coudurier
687f35f384 support streamed mov/mp4
Originally committed as revision 11234 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-16 18:08:06 +00:00
Baptiste Coudurier
2aaf95a210 choose next sample by sample position
when streams' next dts difference is below AV_TIME_BASE,
to reduce seeking, needed for slow underlying protocols (http),
a slightly modified patch from elupus, elupus at ecce dot se

Originally committed as revision 11226 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-15 19:08:42 +00:00
Mike Melanson
9de2919ce5 adjust indentation on latest patch
Originally committed as revision 11167 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-05 04:32:45 +00:00
Mike Melanson
8b35bd806d Check sanity in the palette loading operation. The addresses a potential security risk in
the MOV/MP4 demuxer.

Originally committed as revision 11166 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-05 04:30:33 +00:00
Baptiste Coudurier
c1da59fa2d return error if malloc failed, found by takis, fix issue 286
Originally committed as revision 11162 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-03 22:26:07 +00:00
Panagiotis Issaris
9cf0419bb1 check mov_read_default return value where appropriate, patch by takis, fix issue 285
Originally committed as revision 11161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-03 22:22:50 +00:00
Reimar Döffinger
1fe47470d1 Make ff_qt_default_palette_* arrays "static const"
Originally committed as revision 11139 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-02 23:27:01 +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
Diego Biurrun
94472c1d49 comment typo
Originally committed as revision 10992 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-10 12:05:30 +00:00
Baptiste Coudurier
3d2308b0af use FFMIN
Originally committed as revision 10848 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-23 22:28:57 +00:00
Baptiste Coudurier
8622613d9f fix issue 225, instead of stoping when wrong atom size is found,
limit atom size to what is left, assuming container atom has correct size..
cricket4.3g2 has incorrect moov atom size which indicates that file size should be
2 bytes bigger than it is and quicktime reads it correctly though.

Originally committed as revision 10836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-22 14:36:14 +00:00
Baptiste Coudurier
68bc33fa9f append extradata atoms when parsing, fix OLOCOONS_O3.mov
Originally committed as revision 10688 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-08 13:06:48 +00:00
Baptiste Coudurier
aaac6c29d2 stop parsing udta if size is wrong/garbage, fix issue 154, fix RQ004F14.MOV
Originally committed as revision 10481 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-12 10:18:01 +00:00
Baptiste Coudurier
74e9b9ae70 set block align to stsd audio v2 bytes per frame for adpcm ms and ima wav, fix surge-2-16-L-ms11.mov and surge-2-16-L-ms02.mov
Originally committed as revision 9895 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-04 12:33:34 +00:00
Michael Niedermayer
bca7db3530 detect MS wav codecs
fixes detection of audio codec though not playback of surge-2-16-L-ms11.mov

Originally committed as revision 9885 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-04 00:22:28 +00:00
Benoit Fouet
d2ace376b0 fill title, author, copyright and comment fields by parsing udta atom
Originally committed as revision 9840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-31 15:20:36 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
1e5f5e3b7a use common tables for mov muxer and demuxer
Originally committed as revision 8205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-03 14:55:11 +00:00
Baptiste Coudurier
25f5f17fbd cosmetics, cleanup tables, add pcm 24/32 le tags
Originally committed as revision 8204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-03 14:33:55 +00:00
Baptiste Coudurier
b0c59da234 partial avid meridien uncompressed support
Originally committed as revision 8203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-03 14:11:45 +00:00
Baptiste Coudurier
57d4d6e733 avid imx support
Originally committed as revision 8193 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-02 12:33:59 +00:00
Baptiste Coudurier
9a63497b0f support for mjpeg bottom field first in mov
Originally committed as revision 8192 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-02 12:26:07 +00:00
Baptiste Coudurier
014a510282 use generic atom to extradata reading function
Originally committed as revision 8191 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-02 12:12:29 +00:00
Baptiste Coudurier
c828c70916 quicktime 'raw ' support
Originally committed as revision 8168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-01 13:03:33 +00:00
Baptiste Coudurier
e809d7e50a remove some printf warnings
Originally committed as revision 7691 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-24 15:59:58 +00:00
Baptiste Coudurier
01aa1937cf make vars unsigned
Originally committed as revision 7690 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-24 15:57:41 +00:00
Baptiste Coudurier
649348777e stop if current sample is higher than sample count
Originally committed as revision 7689 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-24 15:46:59 +00:00
Baptiste Coudurier
560588b717 replace strcpy by memcpy
Originally committed as revision 7685 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-24 12:49:24 +00:00
Baptiste Coudurier
a20a37e69a remove useless field
Originally committed as revision 7682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-24 10:57:38 +00:00
Baptiste Coudurier
69e7070da6 remove obsolete comment
Originally committed as revision 7681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-24 10:56:45 +00:00
Baptiste Coudurier
44d3fea53b make some fields unsigned
Originally committed as revision 7680 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-24 10:55:07 +00:00
Baptiste Coudurier
dfcf8d57c5 add sanity checks
Originally committed as revision 7679 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-24 10:44:24 +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
Alex Beregszaszi
fead30d444 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
Originally committed as revision 7587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-19 22:12:59 +00:00
Baptiste Coudurier
429088dc52 add msrle fourcc, quicktime_bmp.mov
Originally committed as revision 7541 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 00:40:06 +00:00
Baptiste Coudurier
69d987a6e6 add png fourcc
Originally committed as revision 7540 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 00:26:39 +00:00
Baptiste Coudurier
c3135e11f4 add official VC1 fourcc
Originally committed as revision 7434 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-10 10:30:03 +00:00
Diego Biurrun
2eed5a461f Rename variables: faad --> libfaad, faac --> libfaac, faadbin --> libfaadbin
Originally committed as revision 7416 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-06 23:54:01 +00:00
Baptiste Coudurier
8cb976931a partial support for vobsub in mp4, used by nero, unsupported-embedded-subs-2.mp4
Originally committed as revision 7032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 01:05:31 +00:00
Baptiste Coudurier
95a07973cb support m1a hdlr mpeg elementary audio handler, fix Po-Slow_Death_64K.mov
Originally committed as revision 6951 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-09 00:09:27 +00:00
Baptiste Coudurier
48855b26d4 do not overwrite codec type if already known, fix conflict between 'raw ' fourcc used for audio and video, ae002_wordup.mov
Originally committed as revision 6890 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-03 16:19:14 +00:00
Baptiste Coudurier
80c5b9a161 indention
Originally committed as revision 6886 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-03 15:04:47 +00:00
Baptiste Coudurier
152e9a43f2 reintroduce isom field and read version 1 audio stsd only if file is not isom, fix testclip_wrong_version_1_audio_stsd.mp4
Originally committed as revision 6885 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-03 15:02:51 +00:00
Steve L'Homme
949b1a13bf Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
patch by Steve Lhomme, slhomme divxcorp com

Originally committed as revision 6868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 22:39:58 +00:00
Baptiste Coudurier
a512446ed3 clean, always write major brand for debug
Originally committed as revision 6862 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 19:16:18 +00:00
Baptiste Coudurier
02799762c6 remove useless mp4 field
Originally committed as revision 6861 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 19:12:07 +00:00
Baptiste Coudurier
b59cb45632 remove mov_read_leaf and remove useless reading function table, mov_read_default will skip atom with no parsing function anyway
Originally committed as revision 6793 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-25 22:50:49 +00:00
Aurelien Jacobs
7fbde3431a replace coder/decoder file description in libavformat by muxer/demuxer
Originally committed as revision 6774 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-23 08:57:54 +00:00
Baptiste Coudurier
20da94e8c5 activate gif decoder, seems to work fine on showdown2.mov
Originally committed as revision 6767 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-22 16:17:02 +00:00
Baptiste Coudurier
d966b2f0db warn about zlib support needed if file has compressed moov atom
Originally committed as revision 6747 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-20 13:06:50 +00:00
Michael Niedermayer
942f3bb528 move memory reading ByteIOContext init from mov.c to avobuf.c
Originally committed as revision 6744 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-20 09:32:48 +00:00
Michael Niedermayer
143bf7d7c3 dont mess with ByteIOContext internal variables (fixes showdown2.mov)
Originally committed as revision 6733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-19 10:05:36 +00:00
Dominik Mierzejewski
ccd3228e54 Use proper PRI?64 macros for %ll? format to fix printf format warnings:
utils.c:833: warning: format ‘%lld’ expects type ‘long long int’, but argument 5 has type ‘int64_t’
utils.c:833: warning: format ‘%lld’ expects type ‘long long int’, but argument 6 has type ‘int64_t’
utils.c:854: warning: format ‘%lld’ expects type ‘long long int’, but argument 5 has type ‘int64_t’
utils.c:854: warning: format ‘%lld’ expects type ‘long long int’, but argument 6 has type ‘int64_t’
asf.c:872: warning: format ‘%Lx’ expects type ‘long long unsigned int’, but argument 4 has type ‘int64_t’
mov.c:1754: warning: format ‘%llx’ expects type ‘long long unsigned int’, but argument 5 has type ‘int64_t’

Approved by Michael.

Originally committed as revision 6692 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-14 20:43:39 +00:00
Kostya Shishkov
a991b1fecb TIFF decoder
Originally committed as revision 6682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-13 10:48:29 +00:00
Kostya Shishkov
3689cf1649 Targa image decoder
Originally committed as revision 6640 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-11 04:15:04 +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
Baptiste Coudurier
b95d44b6f4 remove useless casts
Originally committed as revision 6552 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-04 13:18:51 +00:00
Baptiste Coudurier
9a630c2532 remove useless casts
Originally committed as revision 6377 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-29 10:30:52 +00:00
Baptiste Coudurier
626a8fe724 remove gcc warnings about void * used in arithmetic
Originally committed as revision 6376 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-29 10:28:11 +00:00
Baptiste Coudurier
9770089d34 move sample size adjusting code after audio stsd v2 parsing to let v2 set correct channel number, fix Sony-hdv2.mov
Originally committed as revision 6373 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-28 17:59:26 +00:00
Baptiste Coudurier
e6f4c806e3 add lpcm fourcc
Originally committed as revision 6372 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-28 17:54:59 +00:00
Baptiste Coudurier
0299a87c41 change codec id if sample size field is set to 24 in stsd, fix Sony-mx5p.mov
Originally committed as revision 6371 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-28 17:52:48 +00:00
Michael Niedermayer
a41104f86a fix sound of SampleVideo.mov (mp2 in mov)
Originally committed as revision 6191 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-07 20:19:37 +00:00
Baptiste Coudurier
c61900c6e9 fix mac3audio.mov, pcm_s8 and pcm_u8 can only have sample size of 1 and only if mono, dont rely on bits per sample which can be wrong
Originally committed as revision 6079 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-24 18:39:57 +00:00
Baptiste Coudurier
b95319a2f2 move amr parameters adjusting like other codecs
Originally committed as revision 6071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-24 09:53:53 +00:00
Baptiste Coudurier
d00f8e1771 dont set width/height for h261/h263/mpeg4 since they are oftenly wrong, let decoder init them
Originally committed as revision 6069 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-24 09:09:20 +00:00
Baptiste Coudurier
312954f056 put dv demuxing code around ifdef
Originally committed as revision 6066 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-24 08:37:51 +00:00
Baptiste Coudurier
989ac5a685 put dv demuxing code around ifdef
Originally committed as revision 6065 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-24 08:32:52 +00:00
Baptiste Coudurier
b60c04547c support vdva fourcc (dv + dv audio in mov)
Originally committed as revision 6064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-24 08:28:11 +00:00
Baptiste Coudurier
b361ba2a45 fourcc cleanup
Originally committed as revision 5969 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-09 12:11:32 +00:00
Baptiste Coudurier
61e3dd7865 enable 'NONE' audio fourcc
Originally committed as revision 5968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-09 12:10:25 +00:00
Baptiste Coudurier
2965f17b4f sample size is 1 if bits per sample is 8 and mono channel
Originally committed as revision 5920 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-03 16:22:01 +00:00
Baptiste Coudurier
e40ee6a268 move common code from mov.c and movenc.c to isom.c
Originally committed as revision 5882 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-01 14:58:15 +00:00