Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit bac3ab13ea)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 59a22afa0b)
Conflicts:
libavcodec/h264.c
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
On some platforms EINVAL could be positive, ensure we return negative values.
(cherry picked from commit e5985185d2)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Set the frame size when decoding DTS audio.
This has the side effect of fixing the computation of timestamps for DTS-HD in compute_pkt_fields. Since frame_size is
not currently set, the duration of a frame is being guessed based on the streams bitrate. But for DTS-HD, the bitrate
currently used is the rate of the DTS core which is much different than the whole DTS-HD stream and leads to a wildly
inaccurate frame duration estimate.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 49c7006c7e)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 0631896885)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
filter_mb_fast assumed that qscale_table was padded like many of the other tables.
(cherry picked from commit 5029a40633)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Fixes decoding of MJPEG files produced by some UVC Logitec web cameras,
such as "Notebook Pro" and "HD C910".
References:
http://trac.videolan.org/vlc/ticket/4215http://ffmpeg.org/trac/ffmpeg/ticket/267
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reviewed-by: Kostya <kostya.shishkov@gmail.com>
(cherry picked from commit 8c0fa61a97)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
This removes all valgrind-reported invalid writes with one
specific test file.
Fixes http://www.ocert.org/advisories/ocert-2011-002.html
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4a71da0f3a)
Fixes CVE-2011-3362, CVE-2011-3973, CVE-2011-3974
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
This version was checked out from the 0.7.2 release and has some bits
reverted to compile in the release/0.6 branch
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Gcc 4.6 only preserves the first value when using an array with an "m"
constraint.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 770c410fbb)
References:
http://bugs.debian.org/635324
Conflicts:
libavcodec/x86/fft_sse.c
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 89f903b3d5)
(cherry picked from commit 9b919571e5)
(cherry picked from commit 7089265756)
Signed-off-by: Reinhard Tartler <siretart@sandy.tauware.de>
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 30fe971934)
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 0d9cba562b)
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 56b37cd1c7)
Unbreaks compilation since the HE-AAC v2 backport
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
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 13184036a6)
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
Fixes issue 2322.
Originally committed as revision 25591 to svn://svn.ffmpeg.org/ffmpeg/trunk
(cherry picked from commit 3dde66752d)
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
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
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
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
Patch by Janne Grunau, janne-ffmpeg jannau net
backport r23334,23337-23338 by cehoyos and stefano
Originally committed as revision 23379 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
Use a larger input audio buffer, refill it when it has less than 4 KB data
left.
backport r23323 by mstorsjo
Originally committed as revision 23377 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
Patch by James Zern for Google, Inc., jzern google com
backportd r23191,23303,23307-23308 by conrad, cehoyos and mstorsjo
Originally committed as revision 23374 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
Patch by Cyril Russo, stage D nexvision A laposte net
backport r23285 by cehoyos
Originally committed as revision 23372 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
Most coder functions read it. Carting this around in the context may be
suboptimal; a refactor should be considered.
backport r23094 by alexc
Originally committed as revision 23218 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
Patch by Nick Brereton <nick at nbrereton dot net>
backport r23085 by ramiro
Originally committed as revision 23216 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
was encountered with a channel range that overlapped the previous substreams,
and the code assumed no such overlap was possible.
Patch by Nick Brereton <nick at nbrereton dot net>
backport r23084 by ramiro
Originally committed as revision 23215 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
This fixes issue1907
Patch by Thomas Devanneaux gmail(thomdev)
backport r23078 by benoit
Originally committed as revision 23211 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
Dustin Brody
Baptiste Coudurier
Diego Biurrun
Rafaël Carré
Mans Rullgard
John Stebbins
Jason Garrett-Glaser
Michael Niedermayer
Reinhard Tartler
Michael Kostylev
Janne Grunau
Reimar Döffinger
Frank Barchard
Jason Garrett-Glaser
Jean-Daniel Dupas
James Zern
Cyril Russo
Maxim Poliakovski
Nick Brereton
Thomas Devanneaux