RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-31 11:53:24 +00:00
Code Issues Projects Releases Wiki Activity
31,076 Commits 37 Branches 400 Tags 262 MiB
b2af83a9ed
Commit Graph

31076 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
d1bc77d86c 0.8.2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 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>
 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
Christian Schmidt
8e3d264fb2 libxvid: add missing include of libavutil/mathematics.h 
Signed-off-by: Mans Rullgard <mans@mansr.com>

(cherry picked from commit 6c374bc0b4)
 2011-07-12 18:05:55 +02:00
Robert Swain
46a2dc9175 vorbis: vpxenc: Add missing include for av_rescale* 
Signed-off-by: Mans Rullgard <mans@mansr.com>

(cherry picked from commit 954a653216)
 2011-07-12 18:05:55 +02:00
Carl Eugen Hoyos
b9e126fbe2 ffmpeg: Fix VDPAU decoding for some H264 samples. 
(cherry picked from commit a4ab70f92e)
 2011-07-12 18:05:55 +02:00
Diego Biurrun
07dc4a79c7 RTSP: Doxygen comment cleanup 
Do not use Doxygen for comments that apply to specific implementation
details; merge some duplicated Doxygen comment blocks.

(cherry picked from commit f75e3da535)
 2011-07-12 18:05:55 +02:00
Diego Biurrun
43de5c034f doxygen: Escape '\' in Doxygen documentation. 
(cherry picked from commit c81a2b9b4f)
 2011-07-12 18:05:55 +02:00
Loren Merritt
2f0a10174e vf_gradfun: relicense x86 asm to LGPL 
Actually I gave permission for LGPL long ago, but the original import
failed to update the license header.
(cherry picked from commit 082768f0b1)
 2011-07-07 16:51:47 +02:00
Reimar Döffinger
e8baa8eb7f Fix av_open_input_stream with uninitialized context pointer. 
Code would allocate a new context but forget to assign it
to the pointer actually passed to avformat_open_input,
potentially causing a crash.
Even if it was initialized it would cause a memleak.
This caused crashes with e.g. mpd, see also
http://bugs.gentoo.org/show_bug.cgi?id=373423

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-07-05 23:26:16 +02:00
Reinhard Tartler
d32b2d4de1 update Changelog 2011-07-03 20:01:08 +02:00
Reinhard Tartler
924b2ee8f2 Add version number to doxygen config 2011-07-03 20:01:08 +02:00
Reinhard Tartler
f95e5225fe doxygen: Drop array size declarations from Doxygen parameter names. 
Adding [] to a Doxygen parameter name clashes with Doxygen syntax.
(cherry picked from commit ff993cd7fc)
 2011-07-03 19:58:33 +02:00
Diego Biurrun
8f536408d1 doxygen: Remove spurious documentation for non-existing function parameters. 
(cherry picked from commit 01c17c88ed)
 2011-07-03 19:58:33 +02:00
Reinhard Tartler
093f0f13e6 doxygen: fix usage of @file directive in libavutil/{dict,file}.h 
(cherry picked from commit 134557f3a4)
 2011-07-03 19:58:29 +02:00
Gavin Kinsey
c172eb7925 Fix segmentation fault in ffprobe 
(cherry picked from commit c558122e4e)
 2011-07-03 19:49:54 +02:00
Reinhard Tartler
154ea553f6 Update Doxyfile to the format preferred by Doxygen 1.7.1 (via 'doxygen -u'). 
This is the version available in Debian stable, so it should be a reasonable
baseline that can be expected to be present on all developer machines.

Moreover, this is the version that is used by the nightly cronjob that
generates the online html version.
(cherry picked from commit 10dde477c7)
 2011-07-03 19:49:54 +02:00
Stefano Sabatini
d734d4ce6a suggest to use av_get_bytes_per_sample() in av_get_bits_per_sample_format() doxy 
The previously suggested replacement - av_get_bits_per_sample_fmt() -
was also deprecated.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ccfa626db8)
 2011-07-03 19:49:53 +02:00
Stefano Sabatini
c445e9dc62 ffmpeg: use av_get_bytes_per_sample() in place of av_get_bits_per_sample_fmt() 
av_get_bits_per_sample_fmt() was deprecated.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit f6d6783a4d)
 2011-07-03 19:49:53 +02:00
Reinhard Tartler
c5c2654351 libavformat: Add an example how to use the metadata API 
Also include it into the doxygen documentation
(cherry picked from commit 12489443de)
 2011-07-03 19:49:53 +02:00
Reinhard Tartler
2fe47b21c8 doxygen: Prefer member groups over grouping into modules 
Before this, almost all module groups have been used for grouping functions
and fields in structures semantically. This causes them to not appear
properly in the file documentation and needlessly clutters up the "Modules"
index.

Additionally, this commit streamlines some spelling and appearances.
(cherry picked from commit 21a19b7912)
 2011-07-03 19:49:53 +02:00