1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Commit Graph

1750 Commits

Author SHA1 Message Date
Michael Niedermayer
0521946359 adding a few checks to the audio packet descrambling, this should hopefully catch all related out of array accesses
note, the original code might have been exploitable

Originally committed as revision 7640 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 03:19:00 +00:00
Michael Niedermayer
b83e83b915 cosmetic
Originally committed as revision 7639 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 01:21:16 +00:00
Diego Biurrun
9688979c51 Fix some more license headers.
Originally committed as revision 7637 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 01:16:42 +00:00
Michael Niedermayer
fc9eb13732 these variables seem to be unused on the demuxer side so theres no sense in setting them
Originally committed as revision 7636 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 00:20:58 +00:00
Michael Niedermayer
236116cb4c get rid of a few idiotic asserts()
Originally committed as revision 7632 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 23:03:09 +00:00
Michael Niedermayer
b586d9eac3 useless &0x80
Originally committed as revision 7631 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 22:46:14 +00:00
Aurelien Jacobs
4014fe37a3 remove now useless codec_tag setting code in voc muxer
Originally committed as revision 7628 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 22:41:37 +00:00
Diego Biurrun
9ba6004993 Remove useless #ifdef.
Originally committed as revision 7625 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 22:02:12 +00:00
Måns Rullgård
621b4c4cef reorder alphabetically
Originally committed as revision 7619 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 21:20:18 +00:00
Måns Rullgård
90d912afd9 remove no longer needed ifeq tests
Originally committed as revision 7618 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 21:06:10 +00:00
Måns Rullgård
eba70fa4e2 remove no longer needed #ifdefs
Originally committed as revision 7617 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 21:04:01 +00:00
Ramiro Polla
95a47d963b BeOS cleanup
Patch by Ramiro Polla % ramiro A lisha P ufsc P br %
Original thread:
date: Jan 20, 2007 8:56 PM
subject: [Ffmpeg-devel] [PATCH] [RFC] change socket read and write functions

Originally committed as revision 7613 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 20:40:22 +00:00
Michael Niedermayer
fe468b331a remove sensless casts
Originally committed as revision 7612 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 20:15:55 +00:00
Michael Niedermayer
24c14d6d01 simplify GUIDs
Originally committed as revision 7611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 20:06:19 +00:00
Michael Niedermayer
5c1844ab56 fix msmpeg4v3 tag in asf
Originally committed as revision 7606 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 13:01:53 +00:00
Michael Niedermayer
d65b823031 simplify
Originally committed as revision 7605 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 12:55:31 +00:00
Michael Niedermayer
acf0b6a657 the context is supposed to be freed in the generic code in utils.c
Originally committed as revision 7604 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 12:47:46 +00:00
Michael Niedermayer
bb85077fc9 remove now useless codec_tag setting code in muxers
Originally committed as revision 7603 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 12:44:58 +00:00
Michael Niedermayer
07495657fb simplify
Originally committed as revision 7602 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 12:43:29 +00:00
Michael Niedermayer
5ecfa9f5fc set codec_tag from codec_id if its not set and can be set based on the AVCodecTag tables
Originally committed as revision 7600 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 12:31:58 +00:00
Michael Niedermayer
4fde033a68 this is wrong but it was that way before the AVCodecTag change, only reason why it didnt broke regressions was that the table wasnt used
Originally committed as revision 7599 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 12:30:44 +00:00
Michael Niedermayer
6c77805fc8 get rid of the [4] limitation of codec tag lists
Originally committed as revision 7596 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 12:08:31 +00:00
Michael Niedermayer
edb6e50682 export a few more codec_tag-codec_id tables
Originally committed as revision 7594 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 02:12:34 +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
Michael Niedermayer
5c4e1928c0 fix indention (dunno why it was messed up ...)
Originally committed as revision 7592 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-20 23:09:27 +00:00
Reimar Döffinger
40d9c544ac Attempt to better document AVFMT_NOFILE.
Originally committed as revision 7590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-19 22:54:50 +00:00
Reimar Döffinger
b8e705ec45 Demuxers with AVFMT_NOFILE will open a (possibly different) file themselves,
so do not probe them if is_opened is set.

Originally committed as revision 7589 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-19 22:52:59 +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
Aurelien Jacobs
763750242b cosmetics: indentation
Originally committed as revision 7583 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-18 23:23:41 +00:00
François Revol
c9c1a8e794 The long awaited BeOS cleanup, phase 1.1: removed useless ifdef, changed check for net_server to IP_MULTICAST_TTL.
Originally committed as revision 7582 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-18 17:48:21 +00:00
François Revol
e9d511dc7e The long awaited BeOS cleanup, phase 1
Originally committed as revision 7581 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-18 17:22:30 +00:00
Alex Beregszaszi
453cd7a496 omg, major typo (fails if card supports rgb24)
Originally committed as revision 7580 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-18 15:42:25 +00:00
Michael Niedermayer
80036204af simplify
Originally committed as revision 7567 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-17 12:06:31 +00:00
Michael Niedermayer
b90ba24b9a simplify pts/dts reading
Originally committed as revision 7565 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-17 10:55:01 +00:00
Michael Niedermayer
75a9fbb9e9 cosmetic
Originally committed as revision 7563 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-17 10:45:59 +00:00
Michael Niedermayer
7e4709b18f reduce len checks, simplifies code
there is a very small chance that a stream which is damaged && unseekable && very small packet && damage to the flags && unlucky buffer state could have a valid packet after a damaged packet lost, but i think this is so unlikely that the simplification outweights it
mans if you disagree with any commit to mpeg.c just say so and ill revert it

Originally committed as revision 7562 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-17 10:44:57 +00:00
Michael Niedermayer
e56cfad04b seperate redo (we dont handle this possibly valid packet) from
error_redo (somethings is definitly wrong) in which case we try to resync from the last startcode

Originally committed as revision 7560 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-17 10:19:10 +00:00
Diego Biurrun
db69c2e590 Make nb_streams unsigned to avoid an ugly cast.
Originally committed as revision 7556 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 22:31:10 +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
Michael Niedermayer
b086d4ff9c fix segfault with http://sam.zoy.org/zzuf/lol-ffplay.wmv
Originally committed as revision 7539 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-15 23:47:53 +00:00
Michael Niedermayer
c33fc0a540 fixing segfault with http://sam.zoy.org/zzuf/lol-ffplay.avi
Originally committed as revision 7537 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-15 22:56:46 +00:00
Måns Rullgård
e22f2aaf99 check for sane values in ogg_get_length(), fix lol-ffplay.ogm fuzz test
Originally committed as revision 7536 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-15 22:45:50 +00:00
Måns Rullgård
20be72c890 save/restore number of streams
Originally committed as revision 7535 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-15 22:05:22 +00:00
Roman Shaposhnik
e950141a58 * Fixing a bug with incorrect bits set in AAUX source pack
* Making DV codec release a buffer on exit
   * Flagging accepted pix_fmts for DV encoder

Originally committed as revision 7531 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-15 07:41:28 +00:00
Baptiste Coudurier
975c88e30e cosmetics, function -> metadata
Originally committed as revision 7526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-15 01:04:43 +00:00
Baptiste Coudurier
d8b3576d42 remove useless essence container data sets for now
Originally committed as revision 7516 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 23:32:51 +00:00
Baptiste Coudurier
8b621afbd1 remove useless preface parsing for now, will reintroduce it if needed
Originally committed as revision 7515 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 23:31:30 +00:00
Baptiste Coudurier
e6837cfaf0 merge multiple descriptor parsing with generic one
Originally committed as revision 7513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 23:23:06 +00:00
Baptiste Coudurier
9bdeba37a0 remove warning, key is const
Originally committed as revision 7509 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 23:17:10 +00:00
Baptiste Coudurier
55de95b9c7 indention
Originally committed as revision 7508 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 23:16:20 +00:00
Baptiste Coudurier
33bddcdc13 follow michael suggestion and simplify code at object level
Originally committed as revision 7507 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 23:14:36 +00:00
Ronald S. Bultje
621810045c makes the filename member of the URLContext a pointer, so that the
structure can be extended in the future without breaking ABI.
patch by Ronald S. Bultje % rbultje A ronald P bitfreak P net %
Original thread:
Date: Jan 1, 2007 6:01 PM
Subject: [Ffmpeg-devel] make URLContext->filename a pointer

Originally committed as revision 7506 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 22:07:19 +00:00
Ronald S. Bultje
fb2b4fc50a add support for HTTP seeking
patch by Ronald S. Bultje % rbultje A ronald P bitfreak P net %
Original thread:
Date: Jan 4, 2007 5:42 AM
Subject: [Ffmpeg-devel] [PATCH/RFC] http seeking

Originally committed as revision 7505 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 22:02:38 +00:00
Reimar Döffinger
86074ce341 Make seeking work in files that contain encrypted tracks.
Originally committed as revision 7502 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 21:23:32 +00:00
Reimar Döffinger
d188691205 10l, > vs. >= typo, caused crashes on last mpc frame
Originally committed as revision 7476 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 16:10:05 +00:00
Reimar Döffinger
1fe68f0e7c Simplify klv_decode_ber_length
Originally committed as revision 7475 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 16:02:22 +00:00
Baptiste Coudurier
3439dc9507 seek back at the end of file after updating header
Originally committed as revision 7473 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:57:26 +00:00
Baptiste Coudurier
8f36d4ba4d simplify
Originally committed as revision 7465 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 12:47:32 +00:00
Baptiste Coudurier
2ab573cdc3 priv_data is allocated internally
Originally committed as revision 7459 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 02:21:28 +00:00
Baptiste Coudurier
a0dc1ccd29 enable mjpeg in swf
Originally committed as revision 7458 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 01:57:43 +00:00
Baptiste Coudurier
655254f001 simplify
Originally committed as revision 7457 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 01:20:24 +00:00
Baptiste Coudurier
5b1e5dce35 swf can contain only one audio track, simplify
Originally committed as revision 7456 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 01:14:31 +00:00
Baptiste Coudurier
432cef7605 use ch_id as AVStream id and simplify
Originally committed as revision 7455 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 01:07:14 +00:00
Baptiste Coudurier
ec54839ab1 always export audiostreams
Originally committed as revision 7454 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 00:54:03 +00:00
Baptiste Coudurier
b4bcf81001 always export videostreams
Originally committed as revision 7452 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 00:46:37 +00:00
Baptiste Coudurier
6ac558eefc AnyType is needed, descriptor_ref can reference Descriptor or MultipleDescriptor
Originally committed as revision 7451 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 00:32:25 +00:00
Reimar Döffinger
977d126e6e Use macros to eliminate code duplication in MXF metadata read functions.
Originally committed as revision 7449 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-13 21:13:26 +00:00
Reimar Döffinger
2d193b2ea0 Extend mxf_resolve_strong_ref by a type parameter, to avoid modify something
that actually has a different type.

Originally committed as revision 7448 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-13 18:54:48 +00:00
Reimar Döffinger
717f1019a8 Fix error message, it's package ref that can not be found, not track in this case
Originally committed as revision 7447 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-13 18:21:55 +00:00
Diego Biurrun
6187b8bde3 typo: pallete --> palette
Originally committed as revision 7444 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-13 04:19:45 +00:00
Roman Shaposhnik
6eb2de748d * Fixing seeking with DV-AVI (by Jeff Downs <heydowns at borg dot com>)
Originally committed as revision 7439 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-11 22:32:19 +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
Baptiste Coudurier
dfc58c5d64 removed unused av_frac_set
Originally committed as revision 7430 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-08 14:44:13 +00:00
Baptiste Coudurier
702dfe0194 remove #if obsoleted after last major version bump
Originally committed as revision 7429 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-08 14:42:01 +00:00
Baptiste Coudurier
8fae2df5e8 10l, only allocate priv_data if not already done
Originally committed as revision 7428 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-08 14:22:00 +00:00
Baptiste Coudurier
c6efa4b5b0 humm, actually do what's in the doxy
Originally committed as revision 7427 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-08 12:57:08 +00:00
Baptiste Coudurier
fed7d06796 priv_data is allocated/freed internally
Originally committed as revision 7426 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-08 12:33:16 +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
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
e943369fd4 simplify
Originally committed as revision 7409 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-05 14:23:13 +00:00
Baptiste Coudurier
17230c9d4d dont skip too many bytes if tag is TAG_STREAMHEAD2 and mp3
Originally committed as revision 7408 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-05 14:17:41 +00:00
Michael Niedermayer
d0966f026c missdetected a broken mp3
Originally committed as revision 7404 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-02 22:22:12 +00:00
Michael Niedermayer
69c262d156 indention
Originally committed as revision 7403 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-02 20:35:46 +00:00
Michael Niedermayer
1694118b9b nth try of getting the frame rate detecton working
Originally committed as revision 7402 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-02 20:32:01 +00:00
Benjamin Larsson
09d8c0ae83 VP6 and flashsv stream copy and muxing support.
Originally committed as revision 7399 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-01 22:52:22 +00:00
Michael Niedermayer
aa38b09769 AVSEEK_SIZE doxy
Originally committed as revision 7397 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-01 21:53:15 +00:00
Michael Niedermayer
1ae2c5f2e7 fix indention of previous commit
Originally committed as revision 7396 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-01 21:49:50 +00:00
Michael Niedermayer
8e287af090 seekless filesize retrieving support in 7 lines of code, also doesnt break compatibility
Originally committed as revision 7395 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-01 21:49:09 +00:00
Michael Niedermayer
ecec87afc6 revert regression test breaking change
Originally committed as revision 7394 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-01 21:17:14 +00:00
Kostya Shishkov
aac88b534c Decode previous 32 frames to avoid seeking artifacts in MPC
Originally committed as revision 7393 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-01 05:32:27 +00:00
Kostya Shishkov
0587b0cacd Make MPC demuxer deal with ID3 tags at the beginning
Originally committed as revision 7392 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-01 05:29:53 +00:00
Michael Niedermayer
4b96d28abc ignore duration of the first 2 frames in the max-time break check
fixes framerate detection for framerate_misdetected.wmv

Originally committed as revision 7384 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-29 21:41:06 +00:00
Michael Niedermayer
6268538afa do not base frame rate guess on just one duration
Originally committed as revision 7383 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-29 21:16:21 +00:00
Allan Hsu
148c9bdbb8 Patch for the FLV muxer to supply more complete metadata
in the onMetaData header. Patch by Allan Hsu <allan at counterpop dot net>.

Originally committed as revision 7382 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-28 12:35:22 +00:00
Kostya Shishkov
e311363245 Enable forward seek in Musepack demuxer
Originally committed as revision 7381 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-28 05:33:31 +00:00
Mike Frysinger
d037d797a4 fall back mmap() call using MAP_PRIVATE for working on no-mmu systems
patch by Mike Frysinger   vapier.adi _at_ gmail.com

Originally committed as revision 7380 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-28 00:32:06 +00:00
Patrice Bensoussan
62ade082bb Decode genre on asf/wma files.
patch by  patrice.bensoussan _at_ free.fr

Originally committed as revision 7379 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-28 00:24:24 +00:00
Kostya Shishkov
185c7b6b26 Musepack SV7 decoding support
Originally committed as revision 7375 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-24 04:51:43 +00:00
Diego Biurrun
f8aa696f9f Properly check for all required bktr headers.
inspired by a patch from Tatu Kilappa, trilkk iki fi

Originally committed as revision 7374 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-24 03:53:15 +00:00