Baptiste Coudurier
c956611527
move aspect ratio code at the end of the track parsing, fix cathedral-beta2-400extra-crop-avc.mp4
...
Originally committed as revision 21301 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-18 21:38:39 +00:00
Andrew Wason
ff5ab5c8c9
set stream aspect from mov tkhd width/height, patch by Andrew Wason, rectalogic at rectalogic dot com
...
Fixes issue 671.
Originally committed as revision 21210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-14 00:32:36 +00:00
Baptiste Coudurier
49544546b0
do not skip mdat data if it's the last atom, avoids one seek
...
Originally committed as revision 21209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-13 23:33:29 +00:00
Baptiste Coudurier
7b1312fa55
cosmetics, remove useless parentheses, add space
...
Originally committed as revision 21025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 22:59:43 +00:00
Baptiste Coudurier
a510991cff
simplify error handling in mov_read_default
...
Originally committed as revision 21024 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 22:58:19 +00:00
Baptiste Coudurier
cb41b2b6e0
remove no more needed MOVAtom.offset field
...
Originally committed as revision 21023 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 22:51:38 +00:00
Baptiste Coudurier
7ead7e2181
remove useless code skipping data at end of hdlr atom, already done in mov_read_default
...
Originally committed as revision 21022 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 22:48:27 +00:00
Jai Menon
6866dd1237
Fix typo.
...
Originally committed as revision 20628 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-27 13:10:56 +00:00
David Conrad
b9c78bca26
MOV: cprt is another tag used for copyright
...
Originally committed as revision 20587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-23 08:47:47 +00:00
David Conrad
7382902b86
MOV: Add several iTunes metadata tags
...
Originally committed as revision 20586 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-23 08:47:44 +00:00
Baptiste Coudurier
e26df9ebf1
use AVFormatContext in dprintf
...
Originally committed as revision 20554 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-19 21:03:25 +00:00
Baptiste Coudurier
adeb907137
Search relative path according to alias record when opening mov reference files.
...
Based on patch by Maksym Veremeyenko, verem at m1stereo dot tv
Originally committed as revision 20539 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-15 03:26:47 +00:00
Alex Converse
ba278391ba
Debug print MP4 objectTypeIndication in hex not decimal as values are listed in
...
hex in all official documents.
Originally committed as revision 20523 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-12 02:22:19 +00:00
Alex Converse
5aea268d14
Add a channels field to MPEG4AudioConfig.
...
Originally committed as revision 20512 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-11 20:24:23 +00:00
Baptiste Coudurier
a4cb56aaf4
change \0xa9enc tag metadata name to encoder to match id3v2
...
Originally committed as revision 20469 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-06 18:59:25 +00:00
Baptiste Coudurier
bddc2df52e
10l, typo
...
Originally committed as revision 20462 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 08:53:05 +00:00
Baptiste Coudurier
c2564699bf
do not redundantly set stream nb_frames, it's already set in read_stts
...
Originally committed as revision 20459 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 07:32:50 +00:00
Baptiste Coudurier
e745272196
compute dts shift with ctts value, cslg atom might be missing, fix #419
...
Originally committed as revision 20458 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 07:30:53 +00:00
Baptiste Coudurier
fedb1eca07
check that duration is set to avoid fpe
...
Originally committed as revision 20457 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 07:17:10 +00:00
Baptiste Coudurier
507330b9d3
warn if stream timescale is not set and set it to 1 to avoid FPE
...
Originally committed as revision 20456 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 07:11:54 +00:00
Baptiste Coudurier
55d2e32a40
fix \0xa9wrt metadata, to composer, fix issue #1501
...
Originally committed as revision 20453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 01:40:13 +00:00
haim alon
c5898e8623
compute codec bitrate in mov demuxer, patch by haim alon, haim dot alter at gmail dot com
...
Originally committed as revision 20368 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-24 20:40:00 +00:00
Reimar Döffinger
f2ad907060
10l in code reading codec_name, the first byte is the length and should not
...
become part of the string.
Originally committed as revision 20102 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-30 18:27:39 +00:00
Reimar Döffinger
19635234b1
Convert latin1 codec_name in mov to UTF-8, since all strings in FFmpeg
...
must be valid UTF-8.
Originally committed as revision 20092 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-30 09:43:56 +00:00
Baptiste Coudurier
a42bf19134
100l, typo
...
Originally committed as revision 20033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-26 21:06:18 +00:00
haim alon
7b5252ce3e
Export mov/mp4 major and compatible brands as metadata.
...
Patch by haim alon, haim dot alter at gmail dot com
Originally committed as revision 20032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-26 20:51:38 +00:00
Peter Ross
2d423666c0
Make mov LPCM and AAC parsing functions public
...
Originally committed as revision 19878 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-16 11:35:01 +00:00
Baptiste Coudurier
e4bc8af1e6
check entries against field_size, potential malloc overflow in read_stsz, fix #1357
...
Originally committed as revision 19793 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-07 22:42:51 +00:00
Baptiste Coudurier
1c4bf2ec37
add one missing check for stream existence in read_elst, fix #1364
...
Originally committed as revision 19792 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-07 22:36:33 +00:00
Baptiste Coudurier
d862fce758
only set par if it does not indicates a rotation, ex iphone 3GS
...
Originally committed as revision 19271 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-25 00:17:47 +00:00
Reimar Döffinger
e1c1b0ff09
Reindent after last patch.
...
Originally committed as revision 19265 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 09:40:00 +00:00
Reimar Döffinger
3fe4d5d4e6
mov demuxer: Track the current position also for streams that have AVDISCARD_ALL set.
...
This allows for seamless switching of e.g. audio streams, with the previous code
playback started always from the beginning when removing AVDISCARD_ALL.
Originally committed as revision 19264 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 09:38:42 +00:00
Reimar Döffinger
5dc5c43bda
mov_read_packet: extract code that searches for the stream/sample to demux next
...
into a separate function.
Originally committed as revision 19263 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 08:57:53 +00:00
Reimar Döffinger
a2f3851166
mov_read_packet: if dv_get_packet fails, return exactly its error value
...
instead of always -1 (makes no real difference currently since dv_get_packet
always returns -1 so far).
Originally committed as revision 19262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 08:50:46 +00:00
Reimar Döffinger
69fc436cbc
In mov_read_packet remember the AVStream we want to demux next instead of the
...
MOVStreamContext. We need the AVStream anyway and it is easier to get the
MOVStreamContext from the AVStream than the other way around.
Originally committed as revision 19261 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 08:23:40 +00:00
Baptiste Coudurier
6a63ff19b6
check stream existence before assignment, fix #1222
...
Originally committed as revision 19259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 03:38:47 +00:00
Daniel Verkamp
1a40491ef2
Add ff_ prefixes to exported symbols in libavformat/riff.h.
...
patch by Daniel Verkamp, aniel drv nu
Originally committed as revision 19254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-22 23:09:34 +00:00
Baptiste Coudurier
53e099de8b
check atom size against edit_count to avoid very long loop
...
Originally committed as revision 19198 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-15 02:07:41 +00:00
David Conrad
86b61d4241
Also accept TS as a prefix for wav twoccs (used by Flip4Mac) instead of
...
adding entries to codec_movaudio_tags.
This ensures ADPCM_IMA_WAV uses the standard ms prefix when muxing to mov
rather than TS.
Originally committed as revision 19177 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 00:50:57 +00:00
Baptiste Coudurier
bbe46bc4c2
Remove time_rate, we cannot compute exactly when fragments are
...
used and we cannot determine if fragments are present or not in
streamed mode.
Originally committed as revision 19148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 05:13:23 +00:00
Baptiste Coudurier
281551131d
broken stsd length might be < 16, fix elst-assert.mp4
...
Originally committed as revision 19084 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-03 23:13:53 +00:00
Baptiste Coudurier
7e69621f56
split audio chunks in mov demuxer
...
Originally committed as revision 19018 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 04:36:26 +00:00
Baptiste Coudurier
350f2c2cef
return AVERROR_EOF
...
Originally committed as revision 18992 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-30 06:15:27 +00:00
Baptiste Coudurier
2d5fabc87a
move increment after debug print
...
Originally committed as revision 18851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-16 04:08:34 +00:00
Baptiste Coudurier
171a353159
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
...
Originally committed as revision 18813 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13 08:31:22 +00:00
Baptiste Coudurier
41e6499996
remove comment
...
Originally committed as revision 18811 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13 07:57:08 +00:00
Baptiste Coudurier
4b29ed399f
Parse 'cslg' atom to retrieve dts shift when 'ctts' duration is negative.
...
We have now dts <= pts, note that for some B frames dts+1 == pts can happen
if a crappy timebase is used instead of correct /1001.
Originally committed as revision 18810 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13 07:55:03 +00:00
Jai Menon
b24bbbb4da
Introduce codec id for MPEG-4 ALS and associate it with corresponding
...
AudioObjectType. Also bump libavcodec minor version.
Originally committed as revision 18591 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-17 19:17:14 +00:00
Stefano Sabatini
9106a698e7
Rename bitstream.h to get_bits.h.
...
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 16:20:26 +00:00
Baptiste Coudurier
17ad7b24c8
force sample for qcelp when not stored in mov, fix #968
...
Originally committed as revision 18374 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-08 03:38:59 +00:00
Reimar Döffinger
3dd3604197
Reindent
...
Originally committed as revision 18315 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-02 11:27:14 +00:00
Reimar Döffinger
fb9ac65411
Support DVD subtitles in mov/mp4 as created by Nero.
...
See also http://samples.mplayerhq.hu/sub/NeroMP4/unsupported-embedded-subs-2.mp4
Originally committed as revision 18314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-02 11:26:46 +00:00
Baptiste Coudurier
f03a081df0
set wrong_dts for iMovie created files which has huge ctts delay, fix ffmpeg_sample.m4v
...
Originally committed as revision 18181 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-25 06:07:13 +00:00
Ronald S. Bultje
2121b160d5
Remove alpha channel from default colorspace tables, since it is unused. See
...
"qtpalette.h" thread on mailinglist.
Originally committed as revision 18144 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 13:05:13 +00:00
Baptiste Coudurier
08a5b4e9b5
since code now use get_bits_long, allocate padding buffer
...
Originally committed as revision 18138 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 02:47:35 +00:00
Baptiste Coudurier
a0dd3c0039
reset codec width/height for h264 forcing decoder to parse extradata
...
Originally committed as revision 18134 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 23:29:34 +00:00
Alex Converse
5c3d507f1a
MOV: Use the AOT enum for the mp4_audio_types mapping.
...
Originally committed as revision 18044 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-19 18:13:42 +00:00
Reimar Döffinger
2ac736a6da
Extend mov edit list support to work for a first padding entry with
...
time == -1 and duration. Complicated since time is relative to stream,
duration relative to container time base.
Originally committed as revision 18019 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 20:49:52 +00:00
Alex Converse
d0dab0ecd4
Cosmetics: Re-indent after last commit
...
Originally committed as revision 18017 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 16:24:38 +00:00
Alex Converse
bd27eed6d0
MOV: Support stz2 "Compact Sample Size Box"
...
Originally committed as revision 18016 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 16:14:36 +00:00
Baptiste Coudurier
f05783c2db
cosmetics, remove useless braces
...
Originally committed as revision 18004 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:46:57 +00:00
Baptiste Coudurier
9bf1b2683c
simplify printing
...
Originally committed as revision 18003 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:46:28 +00:00
Baptiste Coudurier
f584386d54
reindent
...
Originally committed as revision 18002 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:44:16 +00:00
Baptiste Coudurier
c6026e4360
fix trkn metadata parsing
...
Originally committed as revision 18001 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:43:38 +00:00
Baptiste Coudurier
0fb44a4e47
move read_udta_string up to avoid forward declaration
...
Originally committed as revision 18000 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:06:05 +00:00
Baptiste Coudurier
873358e5d4
more generic metadata handling
...
Originally committed as revision 17999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:03:29 +00:00
Baptiste Coudurier
2229a5c60e
do not set isom if ctype is not set, happens in mov
...
Originally committed as revision 17998 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 05:13:55 +00:00
Baptiste Coudurier
df8843c65f
search for hdlr atom in meta, some files do not store version+flags
...
Originally committed as revision 17996 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 23:54:53 +00:00
Baptiste Coudurier
7c4502c8c4
typo in the mail, the 4am commit is always the worst
...
Originally committed as revision 17981 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 10:53:12 +00:00
Baptiste Coudurier
983bdd3788
add my copyright in mov de/muxer
...
Originally committed as revision 17979 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 10:49:28 +00:00
Baptiste Coudurier
e49da8273b
allocate palette in codec directly
...
Originally committed as revision 17976 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 09:44:57 +00:00
Baptiste Coudurier
6c00a9dec2
cosmetics, add some whitespaces and empty lines
...
Originally committed as revision 17975 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 09:06:36 +00:00
Baptiste Coudurier
f0f2218dce
do not modify sample_count, check against index entries
...
Originally committed as revision 17972 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 07:21:22 +00:00
Ronald S. Bultje
88c4339bda
Move MOVContext and related structures from mov.c to isom.h. See "[PATCH]
...
move MOVContext from mov.c to isom.h" thread on ML.
Originally committed as revision 17915 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 21:53:00 +00:00
Alex Converse
63581eb183
MOV: fix demuxing fragmented files
...
Originally committed as revision 17803 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-04 07:57:09 +00:00
Alex Converse
fefe43ff2c
MOV: fix crash when 'meta' occurs before first 'trak'
...
Originally committed as revision 17781 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 18:19:44 +00:00
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
Baptiste Coudurier
48a5529016
sample size to 1 might happen for data, fix GMCMidiaASX.mov, fallback is better than failing
...
Originally committed as revision 12547 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 14:30:45 +00:00
Baptiste Coudurier
433aeb6240
support fragments when non streamable
...
Originally committed as revision 12542 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 13:43:19 +00:00
Baptiste Coudurier
61aedb0f56
mp4 fragments support
...
Originally committed as revision 12541 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 13:40:23 +00:00
Baptiste Coudurier
117a9190cd
cosmetics, split or move too long lines
...
Originally committed as revision 12536 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 11:16:16 +00:00
Baptiste Coudurier
db3ee6cc96
simplify, and only stop parsing when non streamable
...
Originally committed as revision 12534 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 11:04:54 +00:00
Baptiste Coudurier
bb787a93dd
atoms are not mp4 only, and yes probe is sufficient
...
Originally committed as revision 12532 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 10:52:14 +00:00
Baptiste Coudurier
9c55b7725b
update description
...
Originally committed as revision 12531 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 10:51:12 +00:00
Baptiste Coudurier
3efe8848fc
return ENOMEM
...
Originally committed as revision 12530 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 10:48:22 +00:00
Baptiste Coudurier
2922cbdb14
cannot free AVStream like this, and return ENOMEM
...
Originally committed as revision 12529 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 10:47:14 +00:00
Baptiste Coudurier
e3c4740fd4
indentation
...
Originally committed as revision 12528 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 10:39:49 +00:00
Baptiste Coudurier
eb61405a07
remove useless debug print since now mov_build_index will do
...
Originally committed as revision 12516 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 16:07:55 +00:00
Baptiste Coudurier
f9900374ec
free track data asap
...
Originally committed as revision 12515 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 16:00:45 +00:00
Baptiste Coudurier
1e77810d3b
move mov_build_index before mov_read_trak to avoid useless declaration
...
Originally committed as revision 12514 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 15:57:11 +00:00
Baptiste Coudurier
bd991df2a7
move specific end treatment when trak is detected, will be needed for fragments
...
Originally committed as revision 12513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 15:55:50 +00:00
Baptiste Coudurier
23f0861715
simplify, flags is 24bits according to specs
...
Originally committed as revision 12460 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-16 15:13:40 +00:00
Diego Biurrun
7ce6892373
misc spelling fixes
...
Originally committed as revision 12410 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 18:42:09 +00:00
Baptiste Coudurier
0de2157fa4
set codec bps to grayscale bits, fix 256grey.mov
...
Originally committed as revision 12272 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-28 16:05:19 +00:00
Baptiste Coudurier
da00a1bdf4
add weird first atom to probe, finally fix bartjones.mov
...
Originally committed as revision 12265 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-27 12:24:27 +00:00
Baptiste Coudurier
dbb3765779
free in case of multiple type == 2
...
Originally committed as revision 12263 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-27 09:31:41 +00:00
Baptiste Coudurier
2f4568e525
return error if malloc fails
...
Originally committed as revision 12262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-27 09:30:56 +00:00
Baptiste Coudurier
dbb7cbf26e
fix possible overflow with memmove
...
Originally committed as revision 12261 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-27 09:30:05 +00:00
Baptiste Coudurier
26846ba515
support keyframes indexes starting at 0, broken files created by omneon, fix ref.mov seeking
...
Originally committed as revision 12242 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 18:27:21 +00:00
Baptiste Coudurier
221e21b70d
support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
...
Originally committed as revision 12241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 18:21:58 +00:00
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
Michael Niedermayer
3840147e12
stsd fix by (Baptiste COUDURIER )baptiste.coudurier smartjog com)
...
Originally committed as revision 4994 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-11 21:43:21 +00:00
Baptiste Coudurier
e60b4ced1f
mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
...
Originally committed as revision 4982 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-11 18:27:57 +00:00
Michael Niedermayer
cd7352d5aa
simplify timebase if possible
...
ignore edit lists instead of always failing
Originally committed as revision 4930 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-02 20:56:35 +00:00
Michael Niedermayer
378251ad08
try avi video name -> codec_id mapping if the mov one has no match
...
Originally committed as revision 4896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-25 16:04:31 +00:00
Diego Biurrun
4f59b684a6
Remove all stray tabs and trailing whitespace, this time for good.
...
Originally committed as revision 4891 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-24 10:33:14 +00:00
Diego Biurrun
5509bffa88
Update licensing information: The FSF changed postal address.
...
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 22:43:26 +00:00
François Revol
ab561df995
finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
...
Originally committed as revision 4792 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-30 20:34:08 +00:00
François Revol
b9a87c4d6c
fix parsing version 1 mdhd atom (64 bit) as suggested by b-o-n-d AT gmx DOT net (unstested); added code to map language codes to stream->language[]
...
Originally committed as revision 4791 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-30 18:25:46 +00:00
Diego Biurrun
bb270c0896
COSMETICS: tabs --> spaces, some prettyprinting
...
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-22 01:10:11 +00:00
Diego Biurrun
115329f160
COSMETICS: Remove all trailing whitespace.
...
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00
Måns Rullgård
4733abcbf3
use PRIxN, %zd, %td formats where needed
...
Originally committed as revision 4740 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-12 01:56:46 +00:00
Roberto Togni
d9b1c197e5
QDM2 compatible decoder
...
Originally committed as revision 4649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-10-18 20:16:43 +00:00
Michael Niedermayer
da7272b335
set time_base as soon as time_scale is known instead of in a unrelated chunck which might be missing
...
Originally committed as revision 4569 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-09-06 22:50:58 +00:00
Michael Niedermayer
302c389e4f
sample_rate value is not always correct (is there anything in quicktime which is?) so try to guess it from time_scale
...
Originally committed as revision 4558 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-09-04 21:04:25 +00:00
Michael Niedermayer
a254c5745b
kill duplicated get/put_be24()
...
Originally committed as revision 4460 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-19 14:41:08 +00:00
Michael Niedermayer
01f4895c68
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
...
Originally committed as revision 4453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-17 22:24:36 +00:00
Aurelien Jacobs
a3075830f2
add hdv2 fourcc to MPEG2 codec mapping
...
Originally committed as revision 4412 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-06-30 11:42:17 +00:00
Michael Niedermayer
edfaf6de29
better dont read the width/height at all, its random anyway
...
Originally committed as revision 4398 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-06-27 07:09:48 +00:00
Michael Niedermayer
961e0ccdca
another chapter in the neverending mov demuxer cleanup
...
a timebase isnt an average frame rate neither can highlevel (considering edit lists) duration be mixed with lowlevel ones
Originally committed as revision 4391 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-06-24 11:43:08 +00:00
Michael Niedermayer
2692067a45
AVPacket.pos
...
Originally committed as revision 4314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-26 20:17:12 +00:00
Michael Niedermayer
e2b9cf4e2e
update current_sample number for non split mode
...
fix chunk split decission
Originally committed as revision 4296 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-21 10:41:52 +00:00
Michael Niedermayer
45139adf30
segfault fix
...
Originally committed as revision 4295 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-21 10:25:58 +00:00
Michael Niedermayer
86d8602f62
support non interleaved mov files
...
Originally committed as revision 4294 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-21 09:50:25 +00:00
Michael Niedermayer
d57b7316c5
10l (overwriting w/h with 0)
...
Originally committed as revision 4289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-21 02:06:45 +00:00
Aurelien Jacobs
a965c478b2
drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol)
...
Originally committed as revision 4275 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-19 00:06:27 +00:00
Michael Niedermayer
c0df9d75bd
switch to native time bases
...
Originally committed as revision 4168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-30 21:43:59 +00:00
Michael Niedermayer
de39cdf542
reverting 1.66 -> 1.67 change
...
Originally committed as revision 4096 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-30 00:36:30 +00:00
François Revol
0d23cb8439
Patch for "uuid" atom followed after atom "ftyp" by "QuickTime <ffmpeg AT gmail DOT com>"
...
Originally committed as revision 4068 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-23 11:20:47 +00:00
Michael Niedermayer
f3356e9c9e
more fine grained discarding of packets
...
Originally committed as revision 4051 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-17 01:25:01 +00:00
François Revol
fcc872422e
Add 3IV2 4CC by "Rob Coenen" <rob AT massive-interactive DOT nl>
...
Originally committed as revision 4033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-12 13:31:03 +00:00
Måns Rullgård
a0f1f16597
uuid patch by (Måns Rullgård <mru inprovide com>)
...
Originally committed as revision 4030 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-11 17:13:03 +00:00
Mike Melanson
6d6d7970e7
first pass at ALAC decoder from David Hammerton; while David's original
...
decoder works great, this decoder is not completely and seamlessly
integrated yet with FFmpeg
Originally committed as revision 4008 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-06 00:43:55 +00:00
Michael Niedermayer
2f1e1ed3dd
mp4a fix based on some code by (Song.Itany inventec-inc com)
...
Originally committed as revision 4002 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-04 00:30:18 +00:00
Måns Rullgård
88730be651
kill warnings patch by (Måns Rullgård <mru inprovide com>)
...
Originally committed as revision 3977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-24 19:08:50 +00:00
tjraivio@cc.hut.fi
8536ab8964
quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
...
Originally committed as revision 3959 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-16 23:14:38 +00:00
Michael Niedermayer
c4ac052b85
set timestamps correctly
...
Originally committed as revision 3944 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-07 16:58:15 +00:00
Michael Niedermayer
cd461d482d
cleanup
...
Originally committed as revision 3943 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-07 13:50:39 +00:00
Roine Gustafsson
92e51b66cf
chunk support in mov patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
...
Originally committed as revision 3890 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-27 15:39:13 +00:00
François Revol
2497479f2b
probe for 'junk' and 'pict', changed the scores.
...
Originally committed as revision 3888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-27 06:53:09 +00:00
Roine Gustafsson
53ffdd1434
mov header field and compressor name patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
...
Originally committed as revision 3885 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-26 09:31:49 +00:00
François Revol
f219664071
AAC fix by Thomas Raivio <tjraivio AT cc DOT hut DOT fi>
...
Originally committed as revision 3866 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-23 10:44:50 +00:00
Gael Chardon
7fe5a3c0c7
Timestamp patch by Gael Chardon <gael DOT ffmpeg AT 4now DOT net>
...
Originally committed as revision 3865 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-23 10:34:10 +00:00
François Revol
7dbab4a9b4
Revert the fixed-size-sample patch as it brokes and others
...
WTF I thought I had commited this yesterday... was probably too asleep :°)
Originally committed as revision 3864 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-23 09:59:36 +00:00
Michael Niedermayer
b9866ebcc7
support discarding uninterresting packets
...
Originally committed as revision 3860 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-22 13:36:02 +00:00
François Revol
c3ea71a097
get debug code to compile again.
...
Originally committed as revision 3815 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-08 19:35:08 +00:00
Roine Gustafsson
7619ed2be4
handle fixed sample_size patch by Roine Gustafsson <roine AT users.sourceforge.net>
...
Originally committed as revision 3814 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-08 16:07:34 +00:00
Michael Niedermayer
568e18b15e
integer overflows, heap corruption
...
possible arbitrary code execution cannot be ruled out in some cases
precautionary checks
Originally committed as revision 3813 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-08 14:21:33 +00:00
Mike Melanson
169eb021d0
load the 'avcC' atom needed for 'avc1' decoding
...
Originally committed as revision 3745 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-09 19:44:55 +00:00
Michael Niedermayer
3129cd0140
allocate a few bytes more for extradata so the bitstream reader if its used by the codec for parsing extardata, doesnt read over the end
...
Originally committed as revision 3679 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-13 01:27:35 +00:00
Michael Niedermayer
7b3c1382bf
100l (forgoten seeking functions)
...
Originally committed as revision 3585 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-11 23:53:53 +00:00
Zdenek Kabelac
7fea94ce4a
* fixing a few of gcc 'clean-code' warnings
...
Originally committed as revision 3563 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-06 08:50:46 +00:00
Mike Melanson
d08d7142fd
support for Sierra Online audio files and Apple QuickDraw codec,
...
courtesy of Konstantin Shishkov
Originally committed as revision 3529 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-28 03:09:49 +00:00
Sebastien Bechet
15c8dbe778
2000/00/00 to 2001/03/01 QT fileformat documentation patch by (Sebastien Bechet <s.bechet at av7 dot net>)
...
Originally committed as revision 3360 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-28 10:04:14 +00:00
Michael Niedermayer
58e555d4ba
mov_read_elst fix, based upon a patch by (Sebastien Bechet <s.bechet at av7 dot net>)
...
Originally committed as revision 3327 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-17 21:01:03 +00:00
Michael Niedermayer
7c4a25c89f
disable mov_read_elst
...
Originally committed as revision 3326 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-17 16:35:47 +00:00
Michel Bardiaux
5c030d3ee9
compilation of mov.c broken patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
...
Originally committed as revision 3292 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-06 18:06:17 +00:00
Gael Chardon
baf25c9dd9
Seeking in .mov/.mp4 files
...
printf->av_log
patch by (Gael Chardon <gael.ffmpeg at 4now dot net>)
Originally committed as revision 3290 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-06 02:35:39 +00:00
Cedric Vincent
3c13647a8a
The atom 'skip' should be handled by 'mov_read_leaf()', not by
...
'mov_read_default()'. This atom has the same behaviour than the atom 'free'.
patch by (Cedric VINCENT <c-vinc02 at bat710 dot univ-lyon1 dot fr>)
the second part of the patch hasnt been applied, but fixed slightly differently
Originally committed as revision 3276 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-30 19:24:43 +00:00
Steven M. Schultz
3ec34bfdb2
libavformat/mov.c fails with gcc 2.95.3 patch by ("Steven M. Schultz" <sms at 2BSD dot COM>)
...
Originally committed as revision 3004 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-12 17:40:31 +00:00
Michael Niedermayer
a90466f741
prefix global
...
Originally committed as revision 2994 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-10 19:42:18 +00:00
Thomas Raivio
2768b0d99f
correctly identify AAC audio in mov/mp4/etc. files. patch by ("Thomas Raivio" <tjraivio at cc dot hut dot fi>)
...
Originally committed as revision 2984 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-09 13:13:24 +00:00
Roman Shaposhnik
cac0a56c55
* .mov files with uncompressed audio can't be correctly processed
...
because of the sample_size == 1 and MINOLTA hack relying on
the information. So in a way, it's a hack of a hack.
btw, if somebody knows why in the world even Apple's software
thinks that for PCM 16bit sample_size == 1 please let me know.
It clearly isn't documented that way.
Originally committed as revision 2941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-31 04:51:14 +00:00
Michael Niedermayer
d957696f17
cleanup frame_rate code, this may also fix some large file bugs
...
Originally committed as revision 2924 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-24 19:03:20 +00:00
Brian Becker
247d56f568
Parse stss info in MOV files to get key frames patch by ("Brian Becker" <Brian dot Becker at palmone dot com>)
...
Originally committed as revision 2879 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-13 21:02:26 +00:00
Michel Bardiaux
bc874daea8
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
...
Originally committed as revision 2840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-03 15:41:21 +00:00
Mike Melanson
070ed1bc43
initial commit for Quicktime Animation (RLE) video decoder; bit depths
...
32, 24, and 16 are working; 8bpp is partially working; 4, 2, and 1 bpp
are not supported yet
Originally committed as revision 2748 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-02-05 05:22:44 +00:00
Fabrice Bellard
8e38ff0c07
fixed double free
...
Originally committed as revision 2499 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-10 18:43:12 +00:00
Mike Melanson
b595afaae7
added palette support to the QT demuxer; registered SMC video decoder
...
with QT system
Originally committed as revision 2489 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-10 03:17:32 +00:00
Roberto Togni
1dc1ed9933
8BPS decoder
...
Originally committed as revision 2486 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-07 22:39:18 +00:00
Mike Melanson
8dafdb88e6
added XVID fourcc (ISO MPEG-4?) and AC3 fourcc
...
Originally committed as revision 2432 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-25 04:41:53 +00:00
Dan Christiansen
4cb3f3b637
Using the extension m4a for audio only MPEG-4 files is increasingly
...
common, especially since Apple iTunes treats files with the two
extensions differently. Without the patch, FFmpeg won't know that m4a
is for MPEG-4 files
patch by (Dan Christiansen <danchr at daimi dot au dot dk>)
Originally committed as revision 2398 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-19 20:57:47 +00:00
Mike Melanson
2fdf638b0c
New demuxers: Sega FILM/CPK, Westwood VQA & AUD; new decoders: MS RLE &
...
Video-1, Apple RPZA, Cinepak, Westwood IMA ADPCM
Originally committed as revision 2324 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-01 04:39:38 +00:00
Michael Niedermayer
d663a1fdc0
AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
...
Originally committed as revision 2311 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-28 20:34:11 +00:00
Fabrice Bellard
25c4950e9b
update duration and start_time
...
Originally committed as revision 2113 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-08 17:58:38 +00:00
Alex Beregszaszi
611d192ce0
warning fixes
...
Originally committed as revision 1980 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-20 17:55:24 +00:00
Johannes Carlsson
14342fd537
* missing part of the 3gp patch by Johannes Carlsson
...
Originally committed as revision 1933 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-06 11:46:25 +00:00
Zdenek Kabelac
bc634f6fc2
* 3gp patch by Joca
...
Originally committed as revision 1931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-05 14:30:52 +00:00
Falk Hüffner
4cfbf61bf1
Warning and compatibility fixes.
...
Originally committed as revision 1902 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-24 18:48:30 +00:00
joca@rixmail.se
891f64b339
AMR-NB audio support patch by (<joca at rixmail dot se>)
...
Originally committed as revision 1876 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-14 11:40:16 +00:00
Zdenek Kabelac
25fa62e13a
* added s263 (mapped to h263 - 3gp files)
...
* less strict header detection - also do not call exit when it's not found.
Originally committed as revision 1864 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-12 17:58:52 +00:00
Zdenek Kabelac
9ed83b0a93
* passing ImageDescriptions for SVQ3 (Vertical300K.sorenson works)
...
(IMHO only SMI chunk should be stored in extradata)
Originally committed as revision 1863 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-12 15:39:38 +00:00
Zdenek Kabelac
fd6e513ee1
* uninitialized/unused vars cleanup
...
Originally committed as revision 1859 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-12 11:07:46 +00:00
Zdenek Kabelac
5ca1d879bb
* support for AAC audio (esds decoding - using extradata)
...
* using MOV_atom_t instead of 3 args
* chunk parsers ordered alphabeticaly
Originally committed as revision 1858 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-12 10:59:18 +00:00
Michael Niedermayer
8b82a95675
svq3 decoder by anonymous
...
Originally committed as revision 1845 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-09 22:16:14 +00:00
Mike Melanson
d86053a416
first pass at a new VP3 video decoder
...
Originally committed as revision 1831 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-05-05 02:54:15 +00:00
Zdenek Kabelac
b6a17df438
* simplified parameters for parse routines
...
Originally committed as revision 1816 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-23 08:58:42 +00:00
Zdenek Kabelac
5cd62665f0
* fixed initialization and some memleak
...
* filling more avcodecs variables
* extending/improving mov parsing (unfinished)
Originally committed as revision 1812 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-22 08:36:39 +00:00
Sebastien Bechet
53e27dd5de
QT AVID 4CCs patch by ("Sebastien Bechet" <s dot bechet at av7 dot net>) (not tested)
...
Originally committed as revision 1737 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-05 12:20:19 +00:00
Michael Niedermayer
14bea432f1
per context frame_rate_base, this should finally fix frame_rate related av sync issues
...
Originally committed as revision 1666 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-12 15:16:19 +00:00
Zdenek Kabelac
0c1a9edad4
* UINTX -> uintx_t INTX -> intx_t
...
Originally committed as revision 1578 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-11 16:35:48 +00:00
François Revol
7ed2dd2db4
removed redundant 4CC
...
Originally committed as revision 1467 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-17 09:22:52 +00:00
François Revol
8b879f18d1
Fix probing for some files (ew.mov, april.mov)
...
Originally committed as revision 1466 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-17 08:29:37 +00:00
Fabrice Bellard
abac617591
renamed libav to libavformat
...
Originally committed as revision 1276 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-25 19:07:40 +00:00