1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Commit Graph

443 Commits

Author SHA1 Message Date
Baptiste Coudurier
60f5c96ee6 remove useless braces
Originally committed as revision 12232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 14:42:07 +00:00
Baptiste Coudurier
18978a4918 indentation
Originally committed as revision 12231 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 14:41:40 +00:00
Baptiste Coudurier
6d680e1b50 rescale frame size, fix i.3g2
Originally committed as revision 12230 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 14:36:49 +00:00
Baptiste Coudurier
f296563e5f move parameters reset after setting stream parameters, will need those infos
Originally committed as revision 12229 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 14:31:36 +00:00
Baptiste Coudurier
852859ff7c protect malloc overflow
Originally committed as revision 12208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:45:59 +00:00
Baptiste Coudurier
17871a02ad indentation
Originally committed as revision 12207 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:44:15 +00:00
Baptiste Coudurier
b014dd7695 fail if extradata cannot be allocated
Originally committed as revision 12206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:42:32 +00:00
Baptiste Coudurier
501f162fde honor stsd v1 first, fix mace surge-2-8-MAC3.mov, beware of mulaw,alaw
Originally committed as revision 11928 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 19:26:45 +00:00
Baptiste Coudurier
6a1f4535f8 10l, forgot alaw/mulaw mono, use bits_per_sample in fact,
it should correctly set by av_get_bits_per_sample if recognized

Originally committed as revision 11925 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 13:11:10 +00:00
Baptiste Coudurier
d435e520d8 warn use if edit list is not starting at 0, a/v desync might occur
Originally committed as revision 11923 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 10:58:16 +00:00
Baptiste Coudurier
fffa99ddd0 remove now useless code
Originally committed as revision 11922 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 10:53:48 +00:00
Baptiste Coudurier
531527652f remove messy and not always correct chunk size workaround, use correct values instead
Originally committed as revision 11921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 10:52:23 +00:00
Baptiste Coudurier
300aa2b039 return error when dv audio extraction fails
Originally committed as revision 11913 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 22:37:44 +00:00
Baptiste Coudurier
e6920f2445 remove obsolete comments
Originally committed as revision 11912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 22:34:43 +00:00
Baptiste Coudurier
3a3aa49ab7 remove useless braces
Originally committed as revision 11911 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 22:34:03 +00:00
Baptiste Coudurier
311490cccd cosmetics, indentation, braces
Originally committed as revision 11910 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 22:33:35 +00:00
Baptiste Coudurier
8cb66fd8f2 split chunks in the case of big compressed audio frames,
might be tweaked, fix qt_dv_pal_test.mov.

Originally committed as revision 11909 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 22:32:35 +00:00
Baptiste Coudurier
77c7543702 use correct demux mechanism when audio compression id is -2, dv audio does not matter, demux partially qt_dv_pal_test.mov which does NOT use cid -2
Originally committed as revision 11908 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 22:23:05 +00:00
Baptiste Coudurier
56ea717b46 indentation
Originally committed as revision 11905 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 14:10:52 +00:00
Baptiste Coudurier
4f0e712ecb more correct and simpler
Originally committed as revision 11904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 14:10:29 +00:00
Michael Niedermayer
744a9c75cf Allow the user to select which codec out of several in stsd he wants.
Originally committed as revision 11873 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-06 01:51:32 +00:00
Reimar Döffinger
cc8c2c6ab3 Add CODEC_ID_MOV_TEXT and use it instead of modifying the stream in the mov demuxer.
Originally committed as revision 11638 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-27 19:57:04 +00:00
Michael Niedermayer
cc8d87b793 Set subtitle codec id correctly, i hope this does not break anything.
Originally committed as revision 11627 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 22:57:53 +00:00
Reimar Döffinger
7dfc1fdea2 Extract the pure plaintext from mov text subtitles.
Formatting information etc. is discarded.

Originally committed as revision 11625 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 21:21:55 +00:00
Michael Niedermayer
1e3c9307e6 Set correct codec type and id for text subtitles.
fixes http://samples.mplayerhq.hu/mov/subtitles-embedded/subtitlemovie.mov
closes issue341

Originally committed as revision 11624 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 20:30:03 +00:00
Michael Niedermayer
41e19673ef indent
Originally committed as revision 11623 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 20:07:57 +00:00
Michael Niedermayer
ee6e2dbebf Only export packets which belong to the existing AVStream.
To export the others separate AVStreams must be created!

Originally committed as revision 11622 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 20:07:30 +00:00
Michael Niedermayer
0bc4728e3b Select non jpeg if there are multiple substreams.
Originally committed as revision 11621 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 19:50:04 +00:00
Baptiste Coudurier
29c90869e6 cosmetics, split overly long lines
Originally committed as revision 11434 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-06 14:18:13 +00:00
Baptiste Coudurier
bde246014f supports glbl atom containing generic extradata for all codecs
Originally committed as revision 11271 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-19 15:39:10 +00:00
Baptiste Coudurier
bcfe2ba02c useless 0L here
Originally committed as revision 11243 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-16 18:51:00 +00:00
Baptiste Coudurier
282b65ccff remove now useless fields
Originally committed as revision 11242 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-16 18:46:57 +00:00
Baptiste Coudurier
7c622eede5 do not retain useless pointers to avstream priv_data, use it directly
Originally committed as revision 11241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-16 18:45:48 +00:00
Baptiste Coudurier
11f16b661a remove duplicate field
Originally committed as revision 11240 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-16 18:30:45 +00:00
Baptiste Coudurier
03dc32f689 cosmetics: func -> parse, remove useless parenthesis
Originally committed as revision 11239 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-16 18:26:34 +00:00
Baptiste Coudurier
a4813b671a remove useless declaration
Originally committed as revision 11238 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-16 18:24:32 +00:00
Baptiste Coudurier
73d07c275a save pointer to parse table, it is unlikely to change
Originally committed as revision 11237 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-16 18:20:27 +00:00
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
Baptiste Coudurier
986c2ccb19 add some useful debug info
Originally committed as revision 5881 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-01 13:43:24 +00:00
Måns Rullgård
9d9f4119bd move common stuff from avienc.c and wav.c to new file riff.c
Originally committed as revision 5720 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-12 00:09:34 +00:00
Måns Rullgård
ff70e60176 allow individual selection of muxers and demuxers
Originally committed as revision 5707 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-10 21:14:37 +00:00
Baptiste Coudurier
2ec7b29b98 assign exact codec id, needed when stream copy
Originally committed as revision 5705 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-10 12:10:10 +00:00
Måns Rullgård
d2a067d1d9 give AVInput/OutputFormat structs consistent names
Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-09 23:40:53 +00:00
Baptiste Coudurier
4990951be8 simplify, use LE_32, BE_32 macros
Originally committed as revision 5682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-08 23:23:47 +00:00
Baptiste Coudurier
cfca95f14d clean up useless code
Originally committed as revision 5669 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-08 13:36:31 +00:00
Baptiste Coudurier
1f1890c754 better handling of partial files
Originally committed as revision 5668 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-08 12:58:50 +00:00
Baptiste Coudurier
b72708f8f3 new mov_read_packet, mov_read_seek, fix seeking in ni mov, fix demuxing adpcm
Originally committed as revision 5667 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-08 12:14:41 +00:00
Baptiste Coudurier
e8d2507c1a add MS ADPCM fourcc
Originally committed as revision 5655 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-07 09:43:46 +00:00
Baptiste Coudurier
e7cc4b52f9 skip others fourcc, if present
Originally committed as revision 5654 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-07 08:56:05 +00:00
Baptiste Coudurier
421de2575b clean
Originally committed as revision 5653 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-07 08:45:50 +00:00
Baptiste Coudurier
05edc1a75a export all tracks to libavformat layer
Originally committed as revision 5482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-15 23:22:32 +00:00
Baptiste Coudurier
ef4c8bbfb7 check fseek return value
Originally committed as revision 5474 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-13 23:13:59 +00:00
Baptiste Coudurier
c3daf8d833 fix unused computed value
Originally committed as revision 5473 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-13 22:49:05 +00:00
Baptiste Coudurier
a2fe3b5869 simplify, completely ignore streams not recognized, that fixes seeking for some files
Originally committed as revision 5468 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-12 13:09:19 +00:00
Baptiste Coudurier
dae5b496fd fix seeking, typo provoking hard segfault
Originally committed as revision 5402 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-18 15:18:25 +00:00
Baptiste Coudurier
c7e63546dc fix keyframe check, stss might be there but count set to 0
Originally committed as revision 5401 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-18 15:17:09 +00:00
Baptiste Coudurier
ed70a5099e add quicktime uncompressed 8bit 4:2:2 support
Originally committed as revision 5379 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-14 14:21:06 +00:00
Baptiste Coudurier
b565ea09c7 fix spliting chunks, simplify
Originally committed as revision 5363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-11 21:29:37 +00:00
Baptiste Coudurier
bfc2a19d7a 10l, undef DEBUG
Originally committed as revision 5354 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-09 22:10:17 +00:00
Baptiste Coudurier
750b4aaabb assing correct codec_id for mjpegb
Originally committed as revision 5353 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-09 22:07:49 +00:00
Baptiste Coudurier
a20da52cbf skip null fourcc, fix ep2_mystery_m640_dummy.mov
Originally committed as revision 5340 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-01 15:52:57 +00:00
Baptiste Coudurier
3cb4ee5124 set width and height even for mpeg4, pix_fmt to NONE will force decoding anwyay
Originally committed as revision 5303 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-19 14:18:13 +00:00
Baptiste Coudurier
b6c1bfe097 add AVID DV fourcc
Originally committed as revision 5302 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-19 12:56:28 +00:00
Baptiste Coudurier
e0977c8045 indention
Originally committed as revision 5301 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-19 12:53:47 +00:00
Baptiste Coudurier
5c72cad888 always skip garbage at end of atom
Originally committed as revision 5300 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-19 12:51:58 +00:00
Baptiste Coudurier
98d12b09af move declaration to mov.h
Originally committed as revision 5299 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-19 10:02:41 +00:00
Baptiste Coudurier
b0519015f0 ignore wrong negative cts values created by quicktime
Originally committed as revision 5229 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-27 16:19:51 +00:00
Baptiste Coudurier
3ed73c46ca let vorbis decoder init too, fix mi2_vorbis51.mp4
Originally committed as revision 5223 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-26 17:05:28 +00:00
Baptiste Coudurier
e31bd3e309 add mp3on4 detection, fix red.mp4
Originally committed as revision 5222 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-26 16:54:53 +00:00
Baptiste Coudurier
ec04d244b5 let faad init parameters properly, fix many SBR samples
Originally committed as revision 5212 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-24 17:03:49 +00:00
Baptiste Coudurier
99487f42b1 fix demuxing of CDR-Dinner_LAN_800k.mp4
Originally committed as revision 5211 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-24 16:52:56 +00:00
Baptiste Coudurier
e1017f2b87 need to dissociate pcm 16bit and 8bit cases
Originally committed as revision 5210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-24 16:01:00 +00:00
Baptiste Coudurier
0dd39bfe5d Quicktime creates S8 that way too
Originally committed as revision 5208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-24 15:38:15 +00:00
Baptiste Coudurier
a66abcb1b5 vorbis seems to be 221, decodes borgcube_vorbis20.mp4, demux mi2_vorbis51.mp4 though not decoded properly (5:1), 249608749a89.3g2 is 225 and is Qclp
Originally committed as revision 5207 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-24 15:25:43 +00:00
Baptiste Coudurier
7e815047e5 use 64bit types
Originally committed as revision 5202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-23 12:11:51 +00:00
Baptiste Coudurier
f444b977a5 clean
Originally committed as revision 5194 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-22 10:56:51 +00:00
Baptiste Coudurier
1175561e19 support 64bit date/duration
Originally committed as revision 5193 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-22 10:45:04 +00:00
Michael Niedermayer
8fcdd831f4 fixing current_sample vs. next_sample mess
Originally committed as revision 5190 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-21 18:32:58 +00:00
Baptiste Coudurier
f4c7b001ab fix sample size for uncompressed sound
Originally committed as revision 5165 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-14 00:25:46 +00:00
Baptiste Coudurier
576f144529 indention
Originally committed as revision 5156 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-12 23:55:34 +00:00
Baptiste Coudurier
6f2741f4a8 use of PRI macros in dprintf
Originally committed as revision 5154 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-12 15:43:22 +00:00
Baptiste Coudurier
5148a2aeeb fix conversion types in dprintf
Originally committed as revision 5153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-12 13:38:56 +00:00
Baptiste Coudurier
0ab16fe09d fix a warning when DEBUG is defined
Originally committed as revision 5152 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-11 18:43:10 +00:00
Michael Niedermayer
70a61ed4e4 some mov files have invalid pts so we need to consider these pts too in calculating the timabase
Originally committed as revision 5149 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-11 11:30:07 +00:00
Baptiste Coudurier
6e2695947d set track timescale to mov timescale if 0 patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
Originally committed as revision 5121 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-06 22:15:43 +00:00
Baptiste Coudurier
79c343c024 referencing more FCP fourccs patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
Originally committed as revision 5119 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-06 21:29:48 +00:00
Baptiste Coudurier
fc5188f3d1 add support for Motion JPEG 2000 file format patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
Originally committed as revision 5118 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-06 21:22:02 +00:00
Baptiste Coudurier
6a045bf3bd Support mov stsd atom version 2.
Patch by Baptiste COUDURIER, baptiste <<dot>> coudurier <<at>> smartjog <<dot>> com

Originally committed as revision 5106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-04 01:13:13 +00:00
Baptiste Coudurier
b4712e3c8b CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
Originally committed as revision 5051 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-22 23:46:20 +00:00
Baptiste Coudurier
de23f234df Cleans reading stsd audio, and makes it more generic patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
Originally committed as revision 5038 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-19 20:00:00 +00:00
Julian Scheid
a7f41f91e7 The current_sample field is meant to be the sample number, not an offset into
the sample data.  Don't increment it by multiples of sc->sample_size.
patch by Julian Scheid, julian _-at-_ sektor37 _-dot-_ de

Originally committed as revision 5037 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-19 12:49:17 +00:00
Baptiste Coudurier
73920f079a simplify mov_read_hdlr patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
Originally committed as revision 5033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-18 09:08:34 +00:00
Baptiste Coudurier
bd12d3e9dc add 'in32' fourcc support patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
Originally committed as revision 5032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-18 09:05:07 +00:00
Baptiste Coudurier
4ea28253b6 add mov_read_ftyp to check iso media file type and set c->mp4 patch by (Baptiste COUDURIER <baptiste.coudurier 0 smartjog o com>)
Originally committed as revision 5031 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-18 09:03:22 +00:00
Michael Niedermayer
dcadd216f1 mov fourccs for handling FCP files by (Baptiste COUDURIER )(baptiste.coudurier smartjog com)
Originally committed as revision 5023 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-14 23:21:17 +00:00
Michael Niedermayer
3253c51f3d useless code removal by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
Originally committed as revision 5012 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-13 10:40:41 +00:00
Michael Niedermayer
75b5b63179 fix demuxing of Video006.3gp
Originally committed as revision 5006 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-12 15:06:03 +00:00
Baptiste Coudurier
232d8a1fba mov split chunks removal patch by (Baptiste COUDURIER / baptiste.coudurier smartjog com>
Originally committed as revision 5005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-12 14:53:47 +00:00
Michael Niedermayer
dbb4f00a2c 10l for myself
Originally committed as revision 5004 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-12 14:50:53 +00:00
Baptiste Coudurier
4e5ef14f0a mov debug clean patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
Originally committed as revision 5001 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-12 10:24:43 +00:00
Alex Beregszaszi
6df84c3ad4 10l, fails to compile when debug enabled
Originally committed as revision 4998 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-12 02:24:37 +00:00