Commit Graph

140 Commits

Author SHA1 Message Date
Evgeniy Stepanov
90c2295b24 Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
of matroska and nut.

Originally committed as revision 12358 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-07 19:25:09 +00:00
Michael Niedermayer
1326621c1a Subtitle support. (untested)
Originally committed as revision 12330 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 13:06:49 +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
6e8b982bcc Move *malloc() out of tree.c, that way the code can be used with
flat arrays which have lower overhead than millions of mallocd() elements.

Originally committed as revision 11399 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-04 17:52:16 +00:00
Diego Biurrun
47a1ae1bc9 Add some parentheses to clarify operator precedence, fixes the warnings:
nut.c: In function 'ff_nut_sp_pos_cmp':
nut.c:43: warning: suggest parentheses around + or - inside shift
nut.c:43: warning: suggest parentheses around + or - inside shift
nut.c: In function 'ff_nut_sp_pts_cmp':
nut.c:47: warning: suggest parentheses around + or - inside shift
nut.c:47: warning: suggest parentheses around + or - inside shift

Originally committed as revision 10926 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-04 22:51:49 +00:00
Baptiste Coudurier
992e78f5f2 rename av_crc04C11DB7_update to ff_crc04C11DB7_update and move it to aviobuf.c so it can be reused by other (de)muxers
Originally committed as revision 10873 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-30 00:01:25 +00:00
Carl Eugen Hoyos
e56397800e Ensure av_tree_insert() is defined before using it.
Patch by Carl Eugen Hoyos   cehoyos _at_ ag.or.at

Originally committed as revision 10083 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-11 23:58:10 +00:00
Michael Niedermayer
4a3b5fe16a move syncpoint cache related stuff to common file
Originally committed as revision 10038 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-09 23:24:02 +00:00
Michael Niedermayer
f13ea4e00c move lsb2full to common file
Originally committed as revision 10025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-09 18:37:28 +00:00
Michael Niedermayer
5c2198b184 move crc wrapper to slightly better spot
Originally committed as revision 10022 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-09 16:46:48 +00:00
Michael Niedermayer
874abace12 move syncpoint timestamp resetting code to a common file
Originally committed as revision 10020 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-09 16:29:30 +00:00
Michael Niedermayer
44f46a698e remove old unused nut (de)muxer
Originally committed as revision 10018 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-09 16:15:50 +00:00
Panagiotis Issaris
769e10f068 Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
Originally committed as revision 9759 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-19 15:21:30 +00:00
Diego Biurrun
a7738a044d URL update, move comment to a better place.
Originally committed as revision 9476 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-05 09:06:27 +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
Diego Biurrun
6ebe07fbb5 variable renaming: mp3lame --> libmp3lame
Originally committed as revision 7417 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-07 00:02:15 +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
Diego Biurrun
3d1eed611b Fix license header error notice by Steve LHomme.
Originally committed as revision 6730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-18 13:15:27 +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
Måns Rullgård
0e176c3eb5 remove redundant declarations
Originally committed as revision 6153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-02 23:10:28 +00:00
Michael Niedermayer
ccb159940b fix regression failure after adler simplification
Originally committed as revision 5803 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-20 10:22:07 +00:00
Måns Rullgård
b9a73d8d2f move adler32 to libavutil
Originally committed as revision 5731 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-13 21:29:01 +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
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
Stefan Huehner
ea138e978a Remove unused variable, patch by Stefan Huehner stefan__at__huehner__dot__org.
Originally committed as revision 5506 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-20 22:19:11 +00:00
Måns Rullgård
a5e9102b4b free codec extradata in av_close_input_file
Originally committed as revision 5484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-16 07:54:37 +00:00
Oded Shimon
9d4461b9f2 Disable lavf NUT until it is synced to spec
Originally committed as revision 5312 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-23 13:47:13 +00:00
Michael Niedermayer
30a43f2d09 add size to AVIndex
Originally committed as revision 5083 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-01 11:29:55 +00:00
Gildas Bazin
6d276a9e91 Properly #ifdef muxer-specific parts.
Taken from a patch by Gildas Bazin < gbazin -- @@ -- altern -- . -- org >

Originally committed as revision 4869 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-19 22:30:37 +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
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
Diego Biurrun
a9e3509529 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
in libavformat to allow building (de)coders and (de)muxers independently at
some point + support for this option in configure.

Originally committed as revision 4611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-09-23 00:25:41 +00:00
Michael Niedermayer
a26e1d4c1f checksum doesnt cover the forward_ptr anymore
Originally committed as revision 4579 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-09-11 08:32:25 +00:00
Michael Niedermayer
177e5460b9 forward_ptr doesnt contain its own length anymore
Originally committed as revision 4578 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-09-11 08:28:03 +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
Michael Niedermayer
16423e179b nut prefers extradata style global headers
Originally committed as revision 4396 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-06-27 00:24:34 +00:00
Alex Beregszaszi
fc565b22fc some nut.hu hype
Originally committed as revision 4358 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-06-07 21:21:54 +00:00
Michael Niedermayer
01bd1ed2db fix stream class
fix a infinite loop on corrupted streams

Originally committed as revision 4343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-06-03 08:54:32 +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
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
Mike Melanson
160d679c07 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
Originally committed as revision 4153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-24 17:21:11 +00:00
Michael Niedermayer
8bb8f41375 initalize has_b_frames
Originally committed as revision 4054 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-17 21:38:29 +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
Luca Barbato
7071e56799 "put_s should store signed values. Spotted on #mplayerdev by someone I
don't remember." patch by (Luca Barbato [lu_zero gentoo org)

Originally committed as revision 4035 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-13 01:58:29 +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
Nilesh Bansal
5c5dea3f0c 01-makefile_fix_updated.patch
Adds --enable-theora/--enable-vorbis/--enable-ogg to configure
   If compiled WITHOUT --enable-theora, native VP3 decoder is used
patch by (Nilesh Bansal <nileshbansal gmail com>)

Originally committed as revision 3975 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-24 15:18:02 +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
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
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
3ba1438dec use native timebase for seeking
direction flag for seeking

Originally committed as revision 3577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-10 22:05:43 +00:00
Michael Niedermayer
ca6ecf50f9 file id string
max short startcode distance

Originally committed as revision 3223 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-14 21:30:36 +00:00
Michael Niedermayer
e928649b0b pass AVPacket into av_write_frame()
fixes the random dts/pts during encoding
asf preroll fix
no more initial zero frames for b frame encoding
mpeg-es dts during demuxing fixed
.ffm timestamp scale fixed, ffm is still broken though

Originally committed as revision 3168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-29 02:06:32 +00:00
Michael Niedermayer
cdd5034f89 store index for seeking in the native timebase of each stream
set correct timebase for nut
merge mpeg-ts seeking with existing seeking code
10l fix in mpegts (27mhz vs. 90khz)

Originally committed as revision 3152 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-23 16:26:12 +00:00
Michael Niedermayer
9ee91c2f53 move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
Originally committed as revision 3148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-21 20:43:21 +00:00
Michael Niedermayer
84ad613008 bytestream tracing support
sync points
removing timestamp lru prediction
extendible frame_code / frame_code table

Originally committed as revision 3142 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-20 16:00:22 +00:00
Michael Niedermayer
0b43db1448 match latest spec
seeking to startcode-less frames

Originally committed as revision 3102 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-02 01:03:55 +00:00
Michael Niedermayer
31179d85cb store correct pts
Originally committed as revision 3008 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-12 22:23:16 +00:00
Michael Niedermayer
75553f825c bit-exact
Originally committed as revision 3007 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-12 20:06:23 +00:00
Michael Niedermayer
8d14a25c3e moving nearly identical binary search code from nut/mpeg/asf to utils.c
Originally committed as revision 3003 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-12 16:50:03 +00:00
Michael Niedermayer
ee76016c79 set codec_tag
Originally committed as revision 2995 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-10 20:11:00 +00:00
Michael Niedermayer
aec8f88a9e removing keyframe prediction and checksum threshold
Originally committed as revision 2991 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-09 16:46:12 +00:00
Steven M. Schultz
1c24c51dec gcc 2.95.3 patch by ("Steven M. Schultz" <sms at 2bsd dot com>)
Originally committed as revision 2983 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-09 12:31:36 +00:00
Michael Niedermayer
7dddf251a2 fourcc & language code v->vb type
some minor cleanups
some bugfixes
seeking to type 1 and 2 frames (no index needed)
timestamp/position cache so seeking without an index is fast

Originally committed as revision 2980 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-08 00:22:22 +00:00
Michael Niedermayer
465e1dadbe 10l (bytes_left() -> url_feof())
10l (updating LRU delta pts for type 1/2 frames)
ensure that checksumming isnt enabled if its not needed
search for next startcode and then search backward to the next valid frame if an inconsistancy is detected
deal with non-frame startcodes in the middle of the stream

Originally committed as revision 2972 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-06 17:40:17 +00:00
Michael Niedermayer
7c5934ede9 search for undamaged headers
Originally committed as revision 2970 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-05 22:00:59 +00:00
Michael Niedermayer
ee9f36a88e checksuming for nut & nice checksum API for libavformat
Originally committed as revision 2969 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-05 12:02:10 +00:00
Michael Niedermayer
5a75750785 10l (Titel->Title)
Originally committed as revision 2967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-05 10:38:01 +00:00
Michael Niedermayer
e52788d069 info packet read/write & simplify
Originally committed as revision 2965 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-04 22:34:26 +00:00
Michael Niedermayer
ae3fa4ea9c make vorbis default again
Originally committed as revision 2964 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-04 20:24:28 +00:00
Michael Niedermayer
a1d4d70c7a large extradata fix
use 3 pts predictors for vorbis, slightly more efficient

Originally committed as revision 2960 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-04 18:37:41 +00:00
Michael Niedermayer
a5247e3d8d nut (de)muxer update
conform to latest spec
 remove get/put_s() not needed anymore
 update_packetheader() fixed (wasnt always working)
 store/load extradata & aspect ratio
 memleak fix
 dont use vorbis by default yet
 use frame_size from the codec instead of hardcoding it in the source

Originally committed as revision 2951 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-03 21:00:14 +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
Alex Beregszaszi
f0a93eb0b2 msb pts support
Originally committed as revision 2576 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-08 17:54:40 +00:00
Alex Beregszaszi
4b68410579 10l
Originally committed as revision 2387 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-15 15:21:46 +00:00
Mike Melanson
764ef40015 disable encoders where appropriate (patch courtesy of BERO
<bero -at- geocities.co.jp>)

Originally committed as revision 2375 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-14 04:15:53 +00:00
Alex Beregszaszi
e692fd601d fixed codec specific data headers
Originally committed as revision 2337 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-02 22:41:08 +00:00
Alex Beregszaszi
cf24628385 fixed time base and sample rate handling
Originally committed as revision 2336 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-02 22:33:55 +00:00
Alex Beregszaszi
5aa0a64494 fix fabrice's broken get_bi and some minor changes in draft
Originally committed as revision 2335 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-02 14:59:54 +00:00
Fabrice Bellard
490579042a 64 bit pts for writing - more const usage
Originally committed as revision 2255 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-10 22:37:33 +00:00
Michael Niedermayer
8c653280bd get_bi(), be/le fix
Originally committed as revision 2254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-10 13:00:24 +00:00
Fabrice Bellard
80783dc2c2 CODEC_ID_MP3LAME is obsolete
Originally committed as revision 2232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-08 22:04:29 +00:00
Fabrice Bellard
a182f5da93 fixed endianness dependancies (untested)
Originally committed as revision 2224 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-08 20:00:13 +00:00
Alex Beregszaszi
ed0bb7bee6 move packetheader after startcodes
Originally committed as revision 2215 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-07 00:37:46 +00:00
Alex Beregszaszi
99b17f25b1 some fixes
Originally committed as revision 2214 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-06 23:17:17 +00:00
Michael Niedermayer
203504d910 padding fix
Originally committed as revision 2213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-06 16:29:05 +00:00
Michael Niedermayer
3ac8749b90 big/little endian fix
storing 64bit stuff in int fix
put_v() fix
startcodes
nut_probe()

Originally committed as revision 2212 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-06 14:03:35 +00:00
Alex Beregszaszi
3aa180b84e initial nut muxer and demuxer (demuxer is not fail safe)
Originally committed as revision 2211 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-05 18:45:32 +00:00