x/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-08-11 12:19:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,044 Commits 40 Branches 431 Tags
n0.8.3
Commit Graph
31044 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer 076a8dfd41 rtpdec_asf: fix memleak 
Based on a suggestion by Ronald S. Bultje
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a2b66a366d)
n0.8.3 		2011-09-07 16:57:24 +02:00
Michael Niedermayer a9a8e5ca99 Update for 0.8.3 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-07 15:27:03 +02:00
Michael Niedermayer c2a2ad133e rtp: Fix integer underflow that could allow remote code execution. 
Fixes MSVR-11-0088
Credit:  Jeong Wook Oh of Microsoft and Microsoft Vulnerability Research (MSVR)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ba9a7e0d71)
 2011-09-07 15:01:30 +02:00
Michael Niedermayer b6187e48db cavsdec: avoid possible crash with crafted input 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9f06c1c61e)
 2011-09-07 14:59:29 +02:00
Michael Niedermayer 8af11e51f2 vf_scale: apply the same transform to the aspect during init that is applied per frame 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c8868f28e3)
 2011-09-07 14:20:53 +02:00
Michael Niedermayer f597825052 Fix memory corruption in case of memory allocation failure in av_probe_input_buffer() 
Reported-by: Tanami Ohad
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 941bb552c6)
 2011-09-07 14:20:53 +02:00
Jeff Downs 7d704f5127 Make all option parsing functions match the function pointer type through which they are called. 
All option parsing functions now match the function pointer signature through
which they are called (int f(const char *, const char *), thereby working
reliably on all platforms.
Prefix all option processing functions with opt_
 2011-09-07 08:56:04 +02:00
Michael Niedermayer eb975b1c8b mjpegdec; even better RSTn skiping 
Fixes Ticket426

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit be7eed72c8)
 2011-09-07 00:31:14 +02:00
Michael Niedermayer 84648d33ba jpegdec: better rst skiping 
Fixes Ticket426

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 94c2478d90)
 2011-09-07 00:31:14 +02:00
Michael Niedermayer 4b8a0b058d mpeg4: fix another packed divx issue. 
Fixes getting_stuck.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6dbac85f8d)
 2011-09-07 00:29:02 +02:00
Michael Niedermayer 1de90fd375 mpeg4: adjust dummy frame threashold for packed divx. 
Fixes Ticket427

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3e7e1f1509)
 2011-09-07 00:29:02 +02:00
Michael Niedermayer c8b37fd03d Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 
* qatar/release/0.7:
  configure: add missing CFLAGS to fix building on the HURD

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-26 01:55:20 +02:00
Pino Toscano b37131f798 configure: add missing CFLAGS to fix building on the HURD 
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit f60d136637)
 2011-08-25 22:47:06 +02:00
Michael Niedermayer 878a7d1573 Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 
* qatar/release/0.7:
  cavs: fix some crashes with invalid bitstreams
  jpegdec: actually search for and parse RSTn

Conflicts:
	libavcodec/mjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-21 22:44:58 +02:00
Mans Rullgard bd968d260a cavs: fix some crashes with invalid bitstreams 
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)
 2011-08-21 11:23:56 +02:00
Michael Niedermayer 00c5cf4beb jpegdec: actually search for and parse RSTn 
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/4215
http://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)
 2011-08-21 11:08:27 +02:00
Carl Eugen Hoyos 6a57021cf9 Fix compilation with --disable-avfilter. 
(cherry picked from commit 67a8251690)
 2011-08-16 23:32:06 +02:00
Michael Niedermayer f20f79307b libavfilter: fix --enable-small 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 633aa01f72)
 2011-08-15 19:49:17 +02:00
Michael Niedermayer d1bc77d86c 0.8.2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
n0.8.2 		2011-08-10 13:48:30 +02:00
Michael Niedermayer 91d5da9321 cavs: fix oCERT #2011-002 FFmpeg/libavcodec insufficient boundary check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-10 13:46:22 +02:00
Carl Eugen Hoyos 08ddfb77a1 Fix possible crash when decoding mpeg streams. 
This reverts 2cf8355f98,
fixes ticket 329.
 2011-08-04 11:49:52 +02:00
Reimar Döffinger a0352d01e9 Bink: clip AC coefficients during dequantization. 
Fixes artefacts with Neverwinter Nights WOTCLogo.bik
(http://drmccoy.de/zeugs/WOTCLogo.bik).
Fixes trac ticket #352.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
(cherry picked from commit 47b71eea09)
 2011-08-04 11:45:28 +02:00
Michael Niedermayer 2ff36ef521 ffmpeg: fix passlogfile regression 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
n0.8.1 		2011-07-28 18:32:26 +02:00
Michael Niedermayer 7e33a66c0e Fix several security issues in matroskadec.c (MSVR-11-0080). 
Whitespace of the patch cleaned up by Aurel
Some of the issues have been reported by Steve Manzuik / Microsoft Vulnerability Research (MSVR)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 956c901c68)
 2011-07-28 15:29:43 +02:00
Baptiste Coudurier 893cf1b1ae ffmpeg: fix prototypes of functions after the removal of OPT_FUNC2. 
(cherry picked from commit 90a40b226a)
 2011-07-27 22:52:36 +02:00
Michael Niedermayer a8d89df367 Fix version numbers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-26 01:01:06 +02:00
Michael Niedermayer 095946afa7 Merge remote-tracking branch 'qatar/release/0.7' into release/0.8 
* qatar/release/0.7: (65 commits)
  riff: Add mpgv MPEG-2 fourcc
  Update Changelog
  matroskadec: fix integer underflow if header length < probe length.
  ffmpeg: fix operation with --disable-avfilter
  vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h
  build: Create mlib optimization directories during out-of-tree builds.
  changelog: misc typo and wording fixes (cherry picked from commit b047941d7d)
  doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support. (cherry picked from commit 5ccbf80963)
  matroskadec: matroska_read_seek after after EBML_STOP leads to failure.
  Update RELEASE file
  update Changelog
  mt: proper locking around release_buffer calls.
  vp8/mt: flush worker thread, not application thread context, on seek.
  docs: Mention the upstream bugzilla url about the dlltool vs MSVC issue
  docs: Use proper markup for a literal command line option
  docs: Don't recommend adding --enable-memalign-hack
  docs: Remove needless configure options
  oggdec: prevent heap corruption.
  oggdec: Abort Ogg header parsing when encountering a data packet.
  Add LGPL license boilerplate to files lacking it.
  ...

Conflicts:
	Changelog
	configure
	doc/developer.texi
	libavcodec/libvpxenc.c
	libavcodec/rawdec.c
	libavfilter/x86/gradfun.c
	libavformat/Makefile
	libavformat/isom.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-26 00:14:04 +02:00
Michael Niedermayer 6d75dbebc0 rtp: disable udp fifos, the rtp code cannot work with the fifos in its current form as rtp bypasses the public API. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 158eb8599a)
 2011-07-25 17:08:48 +02:00
Michael Niedermayer f54b8f8482 udp: allow fifo size to be tuned seperately 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bd652ff66e)
 2011-07-25 17:08:45 +02:00
Alex Converse a05219d801 riff: Add mpgv MPEG-2 fourcc 
Supported by mplayer and seen in the wild.
(cherry picked from commit 505345ed5d)
 2011-07-23 10:29:43 +02:00
Reinhard Tartler c02b02d725 Update Changelog 2011-07-21 09:27:23 +02:00
Chris Evans 5fab0ccd81 matroskadec: fix integer underflow if header length < probe length. 
This fixes a crash with specifically crafted files.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 69619a13c3)
 2011-07-21 09:09:03 +02:00
Mans Rullgard 20829cf8a2 ffmpeg: fix operation with --disable-avfilter 
The width and height must be copied from the input before
being used.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e9f98c9022)
 2011-07-21 09:08:00 +02:00
Stefano Sabatini 0b4840af0c vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h 
cxtypes.h works with version 2.1 and older, cxcore.h works with 2.2 and older.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
(cherry picked from commit 9bc8bcddbd)
 2011-07-18 12:37:22 +02:00
Diego Biurrun 896f80f82c build: Create mlib optimization directories during out-of-tree builds. 2011-07-16 15:20:18 +02:00
Diego Biurrun b57c6d1a4c changelog: misc typo and wording fixes 
(cherry picked from commit b047941d7d)
 2011-07-16 15:15:59 +02:00
Diego Biurrun 3749066dd8 doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support. 
(cherry picked from commit 5ccbf80963)
 2011-07-16 15:15:59 +02:00
John Stebbins c29c609e0f matroskadec: matroska_read_seek after after EBML_STOP leads to failure. 
EBML_STOP leaves matroska->current_id set. Then matroska_read_seek changes
the stream position without resetting current_id.  The next
matroska_parse_cluster  fails due to calculation of incorrect pos.  So clear
current_id when avio_seek happens in matroska_read_seek.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit cdc2c1c576)
 2011-07-16 13:49:34 +02:00
Reinhard Tartler 9459390f29 Update RELEASE file 2011-07-12 18:31:28 +02:00
Reinhard Tartler 2bbd81fba3 update Changelog 2011-07-12 18:13:35 +02:00
Ronald S. Bultje 5e3578893a mt: proper locking around release_buffer calls. 
This fixes a crash when seeking in some webm files with many
threads (e.g. 8).
(cherry picked from commit 5eafc8b466)
 2011-07-12 18:13:35 +02:00
Ronald S. Bultje dc1b670a2c vp8/mt: flush worker thread, not application thread context, on seek. 
This prevents a crash when seeking.
(cherry picked from commit d1cf459119)
 2011-07-12 18:13:35 +02:00
Martin Storsjö 0156f4f9da docs: Mention the upstream bugzilla url about the dlltool vs MSVC issue 
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit b369f327d5)
 2011-07-12 18:13:35 +02:00
Martin Storsjö a52c615a42 docs: Use proper markup for a literal command line option 
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit a3a94e1498)
 2011-07-12 18:13:35 +02:00
Reinhard Tartler 5c2d7c4dc8 docs: Don't recommend adding --enable-memalign-hack 
It is enabled automatically when required nowadays.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 9d36139231)
 2011-07-12 18:13:35 +02:00
Martin Storsjö 004194f465 docs: Remove needless configure options 
Specifying --enable-static --disable-shared isn't necessary, these
are the defaults.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-07-12 18:13:35 +02:00
Chris Evans cd63c32ff6 oggdec: prevent heap corruption. 
Specifically crafted samples can reinit ogg->streams[] while
reading samples, and thus we should not cache old pointers since
these may no longer be valid.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 4cc3467e7a)
 2011-07-12 18:13:35 +02:00
Reimar Döffinger 5a33a29a91 oggdec: Abort Ogg header parsing when encountering a data packet. 
Fixes Bugzilla #11.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
(cherry picked from commit 0a94020b5b)
 2011-07-12 18:13:35 +02:00
Diego Biurrun 683df9bf54 Add LGPL license boilerplate to files lacking it. 
(cherry picked from commit e3759c567d)
 2011-07-12 18:13:35 +02:00
Diego Biurrun 64e2656f7c doxygen: Fix documentation for some VP8 functions. 
(cherry picked from commit 3c432e1186)
 2011-07-12 18:13:35 +02:00