24080 Commits

Author SHA1 Message Date
Reinhard Tartler
2ad6e14457 backport libvo-aacenc wrapper for aac encoding 2011-05-13 12:43:40 +02:00
Reinhard Tartler
f5d14a92cb Release notes for 0.6.3 2011-04-30 09:01:09 +02:00
Reinhard Tartler
b5c3b18bfc update Changelog 2011-04-30 08:44:07 +02:00
Michael Niedermayer
8539ea3265 AMV: disable DR1 and don't override EMU_EDGE
This works around a possibly exploitable crash.
Appearently, vlc can be exploited with a malicous file. This should get
reverted as soon as a proper fix is found.

Reported-at: Thu, 21 Apr 2011 14:38:25 +0000
Reported-by: Dominic Chell <Dominic.Chell@ngssecure.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 89f903b3d5ec38c9c5d90fba7e626fa0eda61a32)
(cherry picked from commit 9b919571e506fbb72b81a35ca1e7c1bd6efc4209)
(cherry picked from commit 7089265756a84bf884a7c2290c6cda38d4dfd60f)

Signed-off-by: Reinhard Tartler <siretart@sandy.tauware.de>
2011-04-30 08:19:29 +02:00
Reinhard Tartler
9848e1be2d lavf: inspect more frames for fps when container time base is coarse
As per issue2629, most 23.976fps matroska H.264 files are incorrectly
detected as 24fps, as the matroska timestamps usually have only
millisecond precision.

Fix that by doubling the amount of timestamps inspected for frame rate
for streams that have coarse time base. This also fixes 29.970 detection
in matroska.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 78431098f9e306ebe27e7698d0ae539e3df2afe9)

Tested with mplayer based on this report
http://thread.gmane.org/gmane.comp.video.mplayer.user/66043/focus=66063

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 7c152a458d3fb0a2fb1aef1f05bfee90fe70697e)
2011-04-30 08:18:32 +02:00
Reinhard Tartler
66ebf37c73 Fix races in default av_log handler
Prevent competing threads from overwriting (shared) buffers.

Original patch by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0247bdee2581a6857a24c5ff297f01d3a3112b11)
2011-04-30 08:16:18 +02:00
Michael Niedermayer
036fefebb9 aac: add headers needed for log2f()
Allows compilation of aaccoder.c under cygwin

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>

(cherry picked from commit 30fe9719344f01a147628e07a8e79a9ccc7e0835)
2011-04-30 08:16:07 +02:00
Michael Niedermayer
1916656641 mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Ronald S. Bultje <rbultje@google.com>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>

(cherry picked from commit 0d9cba562b88899f0769e686d19b7953f589069b)
2011-04-30 08:12:10 +02:00
Michael Kostylev
b4eafa8b04 Support writing 2d float arrays.
Patch by Michael Kostylev, michael D kostylev A gmail

Originally committed as revision 23105 to svn://svn.ffmpeg.org/ffmpeg/trunk
(cherry picked from commit 56b37cd1c7f3b5e5a3ece043c7ffccf70874cfb1)

Unbreaks compilation since the HE-AAC v2 backport
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-03-22 21:15:20 +01:00
Reinhard Tartler
2b2856bac2 Add missing dependencies for the AAC-HE backport for hardcoded tables
Unbreaks compilation with --enable-hardcoded-tables
2011-03-22 21:08:48 +01:00
Martin Storsjö
52f9b632b5 configure: Add the -D parameter to the dlltool command
This is required for the generated .lib file to actually
be usable by MSVC.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 77e41e047dc487e318a0a47e02cfa99d25459b8a)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-03-22 12:42:56 +01:00
Luca Barbato
79e0cbae33 Set the correct target for mingw64 dlltool
That fixes .lib creation for the win64 target.
(cherry picked from commit 417516f63f8a9ee214ee9fa6fcb483962ea0f096)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-03-22 12:42:55 +01:00
Luca Barbato
7fc5bffb54 configure: use dlltools instead of lib.exe
This way building ffmpeg on mingw won't require windows specific tools
(cherry picked from commit ec10a9ab461b26b96eff7bbbb8623f42d8ee04ad)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-03-22 12:42:55 +01:00
Reinhard Tartler
b0f8fdc411 release notes and changelog for 0.6.2 2011-03-18 18:34:49 +01:00
Reinhard Tartler
ba1927dda9 partially rename FFmpeg to Libav
update mailing list references and irc channels in configure
(cherry picked from commit 070c5d0f3530c16c92b81f3f0de2943410367c00)
2011-03-18 18:34:49 +01:00
Janne Grunau
dda2062c31 consolidate .gitignore patters into a single file
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 2c3589bfda036c7827ded0bf38b16dfe7630bae1)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-03-18 17:47:01 +01:00
Janne Grunau
5d01cd8429 convert svn:ignore properties to .gitignore files
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 348b8218f7a59374355c966dbe3b851a7275f952)
2011-03-18 17:46:29 +01:00
Kostya
f9bf2a4ab1 Do not attempt to decode APE file with no frames
This fixes invalid reads/writes with this sample:
http://packetstorm.linuxsecurity.com/1103-exploits/vlc105-dos.txt
(cherry picked from commit 8312e3fc9041027a33c8bc667bb99740fdf41dd5)
2011-03-18 17:02:34 +01:00
Reimar Döffinger
cf69619141 Fix invalid reads in VC1 decoder
Patch discussed and taken from https://roundup.ffmpeg.org/issue2584
(cherry picked from commit 2bbec1eda46d907605772a8b6e8263caa4bc4c82)

Change related to CVE-2011-0723
2011-03-18 17:01:08 +01:00
Reinhard Tartler
2d782b9646 Bump version number for 0.6.2 release. 2011-03-18 16:59:07 +01:00
Frank Barchard
5e3d023702 Check rangebits to avoid a possible crash.
Fixes issue 2548 (and Chrome issue 68115 and unknown CERT issues).

Patch by Frank Barchard, fbarchard at google

Originally committed as revision 26365 to svn://svn.ffmpeg.org/ffmpeg/trunk
(cherry picked from commit 13184036a6b1b1d4b61c91118c0896e9ad4634c3)

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-24 23:26:15 +01:00
Jason Garrett-Glaser
4ac56bf7dc Fix crashes in vorbis decoding found by zzuf
Fixes issue 2322.

Originally committed as revision 25591 to svn://svn.ffmpeg.org/ffmpeg/trunk
(cherry picked from commit 3dde66752d59dfdd0f3727efd66e7202b3c75078)

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-24 23:25:45 +01:00
Diego Biurrun
a38489c0d8 slight rewording for the release focus description
Originally committed as revision 25524 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-10-18 19:46:51 +00:00
Diego Biurrun
a5200fac2c Rewording for the 0.6.1 release notes.
Originally committed as revision 25514 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-10-18 11:28:24 +00:00
Diego Biurrun
32b0876fb5 small spelling fixes
Originally committed as revision 25513 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-10-18 10:52:44 +00:00
Reinhard Tartler
e33f58af5a update version for 0.6.1
Originally committed as revision 25469 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
v0.6.1
2010-10-13 12:44:47 +00:00
Reinhard Tartler
540c6cca6e add note about flic fix (CVE-2010-3429) to RELEASE notes
Originally committed as revision 25468 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-10-13 12:43:18 +00:00
Reinhard Tartler
08f5b2464d add note about flic fix (CVE-2010-3429)
Originally committed as revision 25467 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-10-13 12:42:38 +00:00
Reinhard Tartler
79a16f0cac Fix several security issues in flicvideo.c
This fixes CVE-2010-3429


backport r25223 by michael


Originally committed as revision 25307 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-10-02 07:42:42 +00:00
Reinhard Tartler
9ad774ff33 property changes from the AAC backport
Originally committed as revision 25306 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-10-02 07:35:56 +00:00
Reinhard Tartler
84149812a6 clarify addition of VP80 fourcc code
Originally committed as revision 24636 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-07-31 21:56:15 +00:00
Reinhard Tartler
d41187cb9e update release notes for the upcoming 0.6.1 point release
Originally committed as revision 24635 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-07-31 21:55:38 +00:00
Reinhard Tartler
094e849f32 update changelog for upcoming 0.6.1 point release
Originally committed as revision 24633 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-07-31 21:13:20 +00:00
Reinhard Tartler
ba90f93852 Backport AAC-HE v2 from trunk
This patch has seen testing for a couple of weeks in ubuntu maverick and debian/experimental w/o negative feedback so far.



Originally committed as revision 24576 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-07-28 20:14:28 +00:00
Reinhard Tartler
93883b0c39 aviobuf: Do short seeks forward by reading and skipping data instead of a proper seek
This improves performance on e.g. seekable http.


backport r24280 by mstorsjo


Originally committed as revision 24335 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-07-19 19:51:29 +00:00
Reinhard Tartler
61eb165514 ac3: make the value of codec_id during (E-)AC-3 parsing stay CODEC_ID_EAC3
if any E-AC-3 frames have been detected instead of switching back and forth for
AC-3 core + dependent E-AC-3 substream(s).
Fixes Issue 2022.

backport r24103 by jbr


Originally committed as revision 24136 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-07-09 01:16:42 +00:00
Google
9d1213912f Add VP80 fourcc
Patch by Google

backport r23193 by conrad


Originally committed as revision 23863 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-28 20:38:36 +00:00
Reinhard Tartler
edf5072fea Doxygen av_codec_get_id() and av_codec_get_tag().
backport r23102 by stefano


Originally committed as revision 23801 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-26 15:32:27 +00:00
Jean-Daniel Dupas
32fa7cecd7 Some fields were incorrectly reset (to NULL) when calling avcodec_copy_context().
Patch by Jean-Daniel Dupas, devlists shadowlab org 


backport r23344 by cehoyos


Originally committed as revision 23793 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-26 14:24:14 +00:00
Reinhard Tartler
b9ebd7dc7d 10l: aacsbr: Fix f_master[2] calculation when k2diff == -1.
backport r23660 by alexc


Originally committed as revision 23747 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-24 05:46:58 +00:00
Diego Biurrun
55b6e09e5e Fix two small typos.
Originally committed as revision 23678 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-21 09:17:19 +00:00
Reinhard Tartler
aa48d9e64c remove note that libvpx was considered (L)GPL incompatible
Originally committed as revision 23623 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-16 06:10:30 +00:00
Reinhard Tartler
d7e98ea6ac configure: fix symver detection with icc 10
Apparently the compiler sometimes bypasses the normal assembler, in
which case the asm label variant works.  If the file contains any
inline asm, this bypassing is not done, and the assembler chokes on
invalid syntax.  Inserting a dummy asm() statement in the test when
the compiler supports it makes sure no shortcuts are taken and the
test fails as it should.

backport r23616 by mru


Originally committed as revision 23618 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
v0.6
2010-06-15 19:44:30 +00:00
Reinhard Tartler
8182bcae90 Fix symbol version compat wrappers on systems with export prefixes
backport r23615 by mru


Originally committed as revision 23617 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-15 19:44:09 +00:00
Reinhard Tartler
522f1861ca Add compatibility wrappers for functions moved from lavf to lavc
When symbol versioning is enabled, moving symbols from one library to
another breaks binary compatibility.  This adds wrappers with the old
version tag for the av_*packet functions recently moved to lavc.

backport r23611 by mru


Originally committed as revision 23613 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-15 13:31:27 +00:00
Reinhard Tartler
44f91788a5 revert r23610, better patch is pending
Originally committed as revision 23612 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-15 13:29:20 +00:00
Reinhard Tartler
03b47bb8d7 add symver hacks for gnu linkers
this patch restores binary compatibility for the av_*_packet symbols that have
been moved from libavformat to libavcodec.  This patch works for gnu toolchains
only; support for ARM RCVT will be handed in for a later point release as soon
as the patch is ready and approved by the ARM maintainer(s).


Originally committed as revision 23610 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-15 12:29:19 +00:00
Reinhard Tartler
05b4e4fe49 remove redundant changelog entry
Originally committed as revision 23560 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-10 08:10:32 +00:00
Reinhard Tartler
3229bf8573 librtmp may link to different ssl implementations
Make sure we link using the right libs by using pkg-config



backport r23511 by lu_zero


Originally committed as revision 23550 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-09 15:55:02 +00:00
James Zern
db06ddf8c6 Add WebM muxer
Patch by James Zern <jzern at google>

backport r23474 by conrad


Originally committed as revision 23549 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-09 15:54:27 +00:00