generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,767 Commits 24 Branches 241 Tags
Commit Graph

82 Commits

Author SHA1 Message Date
Alex Converse
5a92aa378d dv: Fix small stack overread related to CVE-2011-3929 and CVE-2011-3936. 
Found with asan.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Alex Converse <alex.converse@gmail.com>
(cherry picked from commit 2d1c0dea5f6b91bec7f5fa53ec050913d851e366)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 00fa6ffe1a0b252d6a81815e51f125225cd0b97a)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit a8f4db0acd9b588ba33e3b8c0c21feea5916cfd1)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2012-04-21 15:41:57 +02:00
Michael Niedermayer
c4e8c99507 dv: Fix null pointer dereference due to ach=0 
dv: Fix null pointer dereference due to ach=0

Fixes part2 of CVE-2011-3929

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Reviewed-by: Roman Shaposhnik <roman@shaposhnik.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Alex Converse <alex.converse@gmail.com>
(cherry picked from commit 5a396bb3a66a61a68b80f2369d0249729bf85e04)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 44e182d41e3a73548f3f5e8445ec428d3846e6d6)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit b46141b0d1d7efb74dad172b7c1b52413441592f)

Conflicts:

	libavformat/dv.c
 2012-04-21 15:41:30 +02:00
Michael Niedermayer
479869c499 dv: check stype 
dv: check stype

Fixes part1 of CVE-2011-3929
Possibly fixes part of CVE-2011-3936

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Reviewed-by: Roman Shaposhnik <roman@shaposhnik.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Alex Converse <alex.converse@gmail.com>
(cherry picked from commit 635bcfccd439480003b74a665b5aa7c872c1ad6b)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit bb737d381f6d6413899a0697f426fb082eac66fc)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 38421f27b3899a930552750fe1e0dffd45b71b8e)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2012-04-21 15:39:00 +02:00
Baptiste Coudurier
e34a5996b9 dv probe 
Originally committed as revision 17607 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-26 08:45:59 +00:00
Reimar Döffinger
67d44b84c1 Support playback of incorrectly cut DV files where the headers do not 
start at the first byte.

Originally committed as revision 17519 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-22 09:42:56 +00:00
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences. 
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-19 15:46:40 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +00:00
Roman Shaposhnik
6d8b21f3e8 additional recovery for the badly broken streams 
Originally committed as revision 16438 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-05 17:50:13 +00:00
Diego Biurrun
f94036f159 prettyprinting cosmetics 
Originally committed as revision 15682 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-24 21:41:27 +00:00
Diego Biurrun
75f2c20983 spelling cosmetics 
Originally committed as revision 15681 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-24 21:37:06 +00:00
Michael Niedermayer
51f4155fef Make gcc 2.95 happy. 
Originally committed as revision 15589 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-08 20:55:22 +00:00
Roman Shaposhnik
4e92dabf60 replacing frame_rate and frame_rate_base with an AVRational time_base 
Originally committed as revision 15584 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-07 16:59:18 +00:00
Roman Shaposhnik
a53621fca8 simplifying code as per Michael's suggestion 
Originally committed as revision 15583 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-07 16:14:33 +00:00
Roman Shaposhnik
c9b0b38f45 simplifying the code as per Michael's suggestion 
Originally committed as revision 15577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-07 15:49:45 +00:00
Diego Biurrun
910f02a054 spelling cosmetics 
Originally committed as revision 15518 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-02 16:28:58 +00:00
Roman Shaposhnik
f8007a1473 Intial implementation of the DV100 (AKA DVCPRO HD) decoder and demuxer as 
specified in SMPTE 370M

Originally committed as revision 15010 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-28 22:41:00 +00:00
Roman Shaposhnik
34fab90f18 Two cosmetic changes for improved readability and ease of HDVCPRO HD integration 
Originally committed as revision 14999 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-27 20:28:11 +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
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
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
Diego Biurrun
ccd425e799 Remove unnecessary parentheses from return calls. 
Originally committed as revision 13069 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-06 09:16:36 +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
Panagiotis Issaris
6f3e0b2174 Replace all occurrences of AVERROR_IO with AVERROR(EIO). 
Originally committed as revision 9760 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-19 15:23:32 +00:00
Maksym Veremeyenko
05ce0f11e4 * clarifying the AVInputFormat::read_seek return value 
* changing dv_read_seek() to return the proper value
    (patch by Maksym Veremeyenko)

Originally committed as revision 9418 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-25 02:08:04 +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
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
Panagiotis Issaris
d4fc91b449 Split the DV demuxer and muxer into separate files (as suggested by Diego 
Biurrun).

Originally committed as revision 6272 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-15 19:14:24 +00:00
Roman Shaposhnik
3c8f30a745 * Restructuring the division of labor between DV codec and DV format 
[ Based on a patch by Brian Brice (bbrice at newtek dot com) ]

Originally committed as revision 6161 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-04 03:33:11 +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
a97c1e93aa Add (mostly) const to variable and parameter declaration, where a char* was 
used and 'const char*' should be, plus make some function declarations
static if they aren't used outside their declaring source file.
patch by Stefan Huehner stefan%%at%%huehner%%dot%%org

Originally committed as revision 5492 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-17 15:53:23 +00:00
Roman Shaposhnik
c4e7baa85c * fixing DV-in-AVI type1 packet production bug 
Originally committed as revision 5262 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-04-01 23:13:53 +00:00
Daniel Maas
0b297700b7 DVCPRO50 support. 
Patch by Daniel Maas dmaas at maasdigital dot com

Originally committed as revision 5113 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-06 08:54:33 +00:00
Diego Biurrun
064cf25155 typo 
Originally committed as revision 4960 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-08 11:43:47 +00:00
Diego Biurrun
8228bff5c6 Put muxer-specific code parts in #ifdef CONFIG_MUXERS. 
based on a patch by Luca Abeni <  lucabe72  #@#  email  #.#  it  >

Originally committed as revision 4871 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-19 23:36:50 +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
Diego Biurrun
d156a7b7f1 typo: viedo --> video 
Originally committed as revision 4553 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-09-03 12:57:21 +00:00
Michael Niedermayer
4325ffd0a2 lowres support 
Originally committed as revision 4545 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-09-02 08:30:26 +00:00
Michael Niedermayer
01f4895c68 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility 
Originally committed as revision 4453 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-07-17 22:24:36 +00:00
Aurelien Jacobs
a965c478b2 drop most url_fileno() calls (allows to use ByteIOContext directly in caller apps instead of URLProtocol) 
Originally committed as revision 4275 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-19 00:06:27 +00:00
Michael Niedermayer
c0df9d75bd switch to native time bases 
Originally committed as revision 4168 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-30 21:43:59 +00:00
Michael Niedermayer
eb1bde3e10 fix nonsense timestamp mess 
Originally committed as revision 4166 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-26 11:04:34 +00:00
Roman Shaposhnik
664f583665 * static allocation for audio packets. This will make it a little bit 
faster and easier to follow.

   * misc. fixes for problems with seeking

Originally committed as revision 3590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-13 00:03:00 +00:00
Michael Niedermayer
8bcb147f54 generic cur_dts update 
removing cur_dts update code from dv again, i think its not needed

Originally committed as revision 3588 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-12 10:28:27 +00:00
Michael Niedermayer
83582de4c1 flags, rounding and cliping fix by (Nathan Kurz <nate at verse dot com>) 
max_pos, buffer flush, audio and video timestamp fix by me

Originally committed as revision 3586 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-12 01:51:04 +00:00
Roman Shaposhnik
5088363247 * experimental dynamic audio stream allocation for DV demuxer. This 
should make Nathan Kurz and if I don't hear too much complaints
     about it -- that's the way it will be from now on.

   * updating regressions

Originally committed as revision 3527 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-27 22:53:27 +00:00
Roman Shaposhnik
96319c3922 * let DV muxer generate audioless DV streams. This might not be 100% 
complaint with the SMPTE & IEC specs, but it seems harmless enough.
     The way we "specify" that there's no audio is by simply leaving
     audio DIFs filled with 0xff (I bet there's a way to mark this
     properly in the system info section!).

Originally committed as revision 3526 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-27 22:46:36 +00:00
Roman Shaposhnik
457c649ac4 * fixing a regression introduced by the last seek-support patch 
Originally committed as revision 3490 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-09-22 04:51:01 +00:00