1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

3099 Commits

Author SHA1 Message Date
Reimar Döffinger
591de5cf35 Fix misplaced const, avoids a cast-discards-qualifiers warning
Originally committed as revision 12146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-19 16:18:17 +00:00
Michael Niedermayer
d937cd0ed2 const
Originally committed as revision 12145 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-19 16:08:52 +00:00
Michael Niedermayer
83a9db42a3 Fix timestamps and durations if the first packets have no durations nor timestamps,
and the information needed to guess the duration only becomes known at a later packet.

Originally committed as revision 11963 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-15 20:32:32 +00:00
Michael Niedermayer
e942293db1 It appears last_pts was not set ...
Originally committed as revision 11939 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-15 13:21:00 +00:00
Michael Niedermayer
a712d725c0 Header elision muxing support.
This only removes 2 bytes from MP3 and MP2 currently.
Up to 4 could be removed from MP3/MP2 though this might need a 2pass muxer.
Primitive code to remove headers from MPEG-1/2/4 is there too but for the
single file I tried it on (the one in the regression tests), it was a loss
because all video frames were >4096 byte, so that it is disabled ATM.

Originally committed as revision 11936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-15 02:57:19 +00:00
Michael Niedermayer
3b4f69ae8c Elision header demuxing support.
Originally committed as revision 11935 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-15 02:36:09 +00:00
Michael Niedermayer
7eeebcc5de Read match time delta in the frame header.
We do not do anything with it as lavf does not really support it yet.

Originally committed as revision 11931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 20:17:28 +00:00
Michael Niedermayer
6cb4b28fea Read match_time_delta in the framecode table.
Originally committed as revision 11930 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 20:13:29 +00:00
Michael Niedermayer
42abeeae3f update flags
Originally committed as revision 11929 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 20:01:09 +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
Luca Abeni
f8cda19ee6 Include poll.h instead of sys/poll.h
Originally committed as revision 11924 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 12:51:14 +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
Diego Biurrun
5e53486545 typo fix: inited --> initialized
Originally committed as revision 11920 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 09:26:10 +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
d0cbff868e fcp imx 40 fourccs
Originally committed as revision 11906 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 15:20:35 +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
D Richard Felker III
03c09e4399 Do not use GNU-specific (or BSD-specific or whatever they may be)
constants which are completely unneeded anyway. Note that 3 is a cheap
integer bound for log10(1<<CHAR_BIT).

Originally committed as revision 11902 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 03:30:42 +00:00
Baptiste Coudurier
91208916c6 cosmetics, remove whitespaces before and after parenthesis
Originally committed as revision 11879 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-06 18:57:00 +00:00
Reimar Döffinger
cb4ddf7765 Add support for speex in ogg
Originally committed as revision 11878 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-06 12:37:37 +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
Baptiste Coudurier
37b74c8651 Fix issue 338:
Correctly interleave ogg packets per granule
and set eos correctly, 2 packets buffering is needed.
It duplicates interleave_per_dts a bit,
if someone has a good solution, I'll implement it.

Originally committed as revision 11867 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-05 01:16:47 +00:00
Baptiste Coudurier
2dd3c9e0fa it seems ogg requires granule to be -1 on unfinished packets
Originally committed as revision 11866 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-05 01:01:56 +00:00
Reimar Döffinger
c901197693 String pointers of ogg_codec_t should have const attribute.
Originally committed as revision 11860 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 12:32:25 +00:00
Christophe Lorenz
23ef05756e Add dv50 tag to support samples with dv50 fourcc in AVI.
patch by christophelorenz  christophelorenz gmail com

Originally committed as revision 11859 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 12:18:00 +00:00
Reimar Döffinger
cd41a73f89 Fix a possible use of an uninitialized pointer.
Originally committed as revision 11857 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 12:13:09 +00:00
Oded Shimon
4ddcc983b4 back_ptr calculation used wrong timebase when searching for back syncpoint
Originally committed as revision 11856 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 10:48:41 +00:00
Oded Shimon
02c986a8d6 Fix intented algo in syncpoint writing before keyframes in NUT muxer
Originally committed as revision 11855 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 10:45:32 +00:00
Oded Shimon
82badd27f1 nut->max_distance was not set at all anywhere in the NUT muxer
Originally committed as revision 11854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 10:34:35 +00:00
Oded Shimon
eae213af43 Remove old workaround in nutdec.c for libnut bug
Originally committed as revision 11853 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 10:30:38 +00:00
Oded Shimon
b19e3983cf missing " && j<syncpoint_count" protection in the index parsing, as the
spec instructs...

Originally committed as revision 11852 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 10:29:03 +00:00
Oded Shimon
103d74ea5c ff_nut_reset_ts() expected to get 'ts*time_base_count', but muxer only
gave it 'ts'. Fixed by changing ff_nut_reset_ts() and demuxer params

Originally committed as revision 11851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 10:27:32 +00:00
Michael Niedermayer
f70eccdb39 2 more missing consts found by -Wwrite-strings.
Originally committed as revision 11849 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 01:06:04 +00:00
Michael Niedermayer
37e4979a2c Remove incorrect cast found by -Wwrite-strings.
Originally committed as revision 11848 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 01:04:27 +00:00
Michael Niedermayer
8df94c73dc Another const found by -Wwrite-strings.
Originally committed as revision 11847 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 01:01:52 +00:00
Michael Niedermayer
8dd8dc5790 fix 8 "initialization discards qualifiers from pointer target type"
warnings

Originally committed as revision 11845 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 00:42:27 +00:00
Michael Niedermayer
0fca8bc835 Fix info packet type, found by oded as well as the new pedantic const
warnings.

Originally committed as revision 11843 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 00:33:52 +00:00
Michael Niedermayer
7ebab67901 -Wwrite-strings nitpicking fix
Originally committed as revision 11842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 00:31:31 +00:00
Michael Niedermayer
4cf97abb98 Missing const found by -Wwrite-strings.
Originally committed as revision 11841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 00:26:43 +00:00
Reimar Döffinger
7abe438045 Remove ff_mms_set_stream_selection again from asf demuxer,
it does not seem like a good solution to the problem and will
cause dependency problems if a libavprotocols should be split out.

Originally committed as revision 11827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-03 11:18:53 +00:00
Michael Niedermayer
dc29622385 Remove incorrect casts that should have never been there.
Originally committed as revision 11824 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-02 22:55:58 +00:00
Reimar Döffinger
2907abed17 Remove a pointless cast.
Originally committed as revision 11819 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-02 22:03:01 +00:00
Reimar Döffinger
4d65da424a Put is_mms under ifdef CONFIG_MMSH_PROTOCOL, avoids warning:
libavformat/asf.c:112: warning: 'is_mms' defined but not used

Originally committed as revision 11815 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-02 21:17:46 +00:00
Reimar Döffinger
b630a39ecd Missing 'const' in cast.
Originally committed as revision 11814 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-02 20:58:58 +00:00
Diego Biurrun
5f359c8d3e cosmetics: sort ogg_codec_t list
Originally committed as revision 11810 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-02 14:55:57 +00:00
Baptiste Coudurier
73965d1b96 const
Originally committed as revision 11763 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 15:17:43 +00:00
Baptiste Coudurier
47a0513b0c const
Originally committed as revision 11762 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 15:17:32 +00:00
Baptiste Coudurier
2b12d6fc79 add const
Originally committed as revision 11756 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 14:58:35 +00:00
Reimar Döffinger
2331e31c23 Add support for ogg text subtitles.
Originally committed as revision 11698 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 22:30:55 +00:00
Baptiste Coudurier
fa7343eaf2 stupid typo
Originally committed as revision 11693 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 13:40:53 +00:00
Baptiste Coudurier
ccac843872 support rawvideo in mov
Originally committed as revision 11691 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 11:31:56 +00:00
Baptiste Coudurier
d7742a7491 typo, typedef uint8_t GUID[16] in asf.h, and fix warning: asf-enc.c:202: warning: passing argument 2 of 'put_buffer' from incompatible pointer type
Originally committed as revision 11684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 00:34:22 +00:00
Baptiste Coudurier
febc8fad0c init to 0, fix warning: mpegenc.c:1022: warning: 'avail_space' may be used uninitialized in this function
Originally committed as revision 11683 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 00:27:51 +00:00
Baptiste Coudurier
87be0d1289 add parenthesis, fix warning: mpegenc.c:303: warning: suggest parentheses around && within ||
Originally committed as revision 11682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 00:25:40 +00:00
Baptiste Coudurier
3dc761a443 typo, also fix warning: asf.c:90: warning: passing argument 2 of 'get_buffer' from incompatible pointer type
Originally committed as revision 11681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 00:22:25 +00:00
Baptiste Coudurier
4ad08accb2 use context in av_log
Originally committed as revision 11668 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-30 13:22:31 +00:00
Baptiste Coudurier
c8134d7104 warning is only valid for mov
Originally committed as revision 11667 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-30 13:22:04 +00:00
Reimar Döffinger
eb3ba13b51 Support MP4 subtitles as in
http://samples.mplayerhq.hu/MPEG-4/embedded_subs/1Video_2Audio_2SUBs_timed_text_streams_.mp4

Originally committed as revision 11663 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-29 22:37:07 +00:00
Kostya Shishkov
eda178d273 SMPTE 421 Annex L format demuxer
Originally committed as revision 11661 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-29 09:25:49 +00:00
Baptiste Coudurier
0b98a7b3b2 cosmetics, split long lines, remove useless braces, merge comments and if
Originally committed as revision 11656 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 18:35:12 +00:00
Baptiste Coudurier
506e4bb8bc cosmetics, vertically align
Originally committed as revision 11655 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 18:33:27 +00:00
Baptiste Coudurier
bbe052463d spoke too fast, fix dv fourcc in mov accordingly if strict
Originally committed as revision 11653 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 16:58:42 +00:00
Baptiste Coudurier
ea1664e33a finally set codec tags for mov/mp4/3gp muxers, this should not break anything, if it breaks anything, yell
Originally committed as revision 11652 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 16:03:50 +00:00
Baptiste Coudurier
d97f214435 indentation
Originally committed as revision 11651 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 15:23:37 +00:00
Baptiste Coudurier
a23c9c4a50 correctly and only set standard stsd fourcc for mp4/3gp
Originally committed as revision 11650 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 15:22:07 +00:00
Baptiste Coudurier
d0c0a29b5a write esds atom when mpeg-4 systems tags are used
Originally committed as revision 11649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 13:44:27 +00:00
Baptiste Coudurier
efc9e44da6 reorder object types id by muxing preference
Originally committed as revision 11648 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 13:19:49 +00:00
Baptiste Coudurier
2c2f58c0ad document tag field
Originally committed as revision 11647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 13:19:16 +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
Evgeniy Stepanov
f8d7c9d373 Add support for Matroska attachments.
patch by eugeni _dot_ stepanov _at_ gmail.com and myself

Originally committed as revision 11635 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-27 15:43:17 +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
Michael Niedermayer
e73e3a926d Add non standard id needed for dvd subtitles.
Originally committed as revision 11626 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 22:55:34 +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
067db6a58a comment vorbis objectype id
Originally committed as revision 11612 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 02:24:35 +00:00
Baptiste Coudurier
4f8dc3b7f1 this one is not standardized either
Originally committed as revision 11611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 02:22:45 +00:00
Baptiste Coudurier
c63d3668fc remove non standard object type ids, if you find samples, report them
Originally committed as revision 11610 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 01:35:51 +00:00
Aurelien Jacobs
7f938dd32b ensure av_rescale_q() can be calculated (won't divide by zero)
Originally committed as revision 11592 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-21 23:43:25 +00:00
Luca Abeni
29e35d6776 Support out-of-band parameter sets in SDP for H.264 video
Originally committed as revision 11590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-21 14:28:58 +00:00
Luca Abeni
f79bfe481d Add support for H.264 video in the RTP muxer
Originally committed as revision 11589 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-21 14:01:57 +00:00
Baptiste Coudurier
afecbec22b unset extension, so code path, and guess format do not choose
avm2/flash 9 by default, not sure this is adequate though,
this fixes regression tests.

Originally committed as revision 11588 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-21 13:43:40 +00:00
Luca Abeni
b21cd0bcb5 Add minimal support for H.264 video in the SDP generator
Originally committed as revision 11585 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-21 11:09:06 +00:00
Aurelien Jacobs
078ac1dbf2 add missing Makefile rules for pcm muxers/demuxers
Originally committed as revision 11579 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-20 21:24:25 +00:00
Baptiste Coudurier
fa1ad97fad reorder alphabetically
Originally committed as revision 11575 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-20 18:31:56 +00:00
Paul Egan
dfb400a8ea new avm2 (flash 9) muxer, patch by Paul Egan, paulegan at mail dot com
Originally committed as revision 11574 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-20 18:30:04 +00:00
Baptiste Coudurier
76e4864583 init uid to 0
Originally committed as revision 11573 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 20:00:09 +00:00
Baptiste Coudurier
e20c865a55 indentation
Originally committed as revision 11572 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 19:59:04 +00:00
Baptiste Coudurier
bb085dd6f1 correctly handle sony mpeg4 extradata
Originally committed as revision 11571 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 19:58:48 +00:00
Baptiste Coudurier
6e3ea4461f check if read child returned error
Originally committed as revision 11570 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-19 19:51:55 +00:00