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