31065 Commits

Author SHA1 Message Date
Michael Niedermayer
f66418afba libavfilter: fix --enable-small
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 633aa01f728b3f67b420e9e34ef21a995578d613)
2011-08-15 19:49:24 +02:00
Michael Niedermayer
7371b0ca6f 0.7.3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
n0.7.3
2011-08-10 13:59:49 +02:00
Michael Niedermayer
c5cbda5079 cavs: fix oCERT #2011-002 FFmpeg/libavcodec insufficient boundary check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-10 13:59:15 +02:00
Carl Eugen Hoyos
8893f7d815 Fix possible crash when decoding mpeg streams.
This reverts 2cf8355f98681bdd726b739008acd5483f82f8d7,
fixes ticket 329.
2011-08-04 11:43:34 +02:00
Reimar Döffinger
7c772ccd27 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 47b71eea099b3fe2c7e16644878ad9b7067974e3)
2011-08-04 11:42:33 +02:00
Michael Niedermayer
cf82c5cd5b ffmpeg: fix passlogfile regression
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2ff36ef521a551b99ea69dda0aa82dc9fa49a131)
n0.7.2
2011-07-28 18:33:07 +02:00
Michael Niedermayer
cb8577a4da 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 956c901c68eff78288f40e3c8f41ee2fa081d4a8)
2011-07-28 15:35:38 +02:00
Baptiste Coudurier
b55b34f862 ffmpeg: fix prototypes of functions after the removal of OPT_FUNC2.
(cherry picked from commit 90a40b226a5c90e48da8041294c3782de6ee61fc)
2011-07-27 23:54:34 +02:00
Michael Niedermayer
609d299ed0 update version for 0.7.2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-27 12:51:28 +02:00
Michael Niedermayer
01a0612c70 Merge branch 'release/0.8' into release/0.7
* release/0.8: (82 commits)
  Fix version numbers
  rtp: disable udp fifos, the rtp code cannot work with the fifos in its current form as rtp bypasses the public API.
  udp: allow fifo size to be tuned seperately
  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 b047941d7da470ba0dcedb1fd0aa828075265ffc)
  doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support. (cherry picked from commit 5ccbf80963c1cc54aed97b1c81b1657ab91baf6a)
  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
  ...

Conflicts:
	VERSION
	libavcodec/opt.h
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-27 11:20:13 +02:00
Reimar Döffinger
dcf1830a15 For FFmpeg 0.7 branch: Treat AV_SAMPLE_FMT_NONE as S16 for encoders.
This fixes compatibility with e.g. pcm_a52 ALSA plugin which in
previous versions never set sample_fmt.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-07-26 21:58:10 +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 b047941d7da470ba0dcedb1fd0aa828075265ffc)
  doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support. (cherry picked from commit 5ccbf80963c1cc54aed97b1c81b1657ab91baf6a)
  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 158eb8599a2811ad8eed9939878982f172b79a89)
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 bd652ff66e2062df5a05030f211c23e7d4e0be36)
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 505345ed5d180093a44da8d70ac541898c31c22f)
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 69619a13c3fef940cba545cf0a283ff22771dd71)
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 e9f98c90229999c0e654bd77af55d7020347440a)
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 9bc8bcddbd4fc394e2268e9849dcbf3bad6de980)
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 b047941d7da470ba0dcedb1fd0aa828075265ffc)
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 5ccbf80963c1cc54aed97b1c81b1657ab91baf6a)
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 cdc2c1c57616956d975c57b4b69eb73865f513f5)
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 5eafc8b46644764f8aef1b7b2ecae53ee8034822)
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 d1cf45911935cc4fed9afd3a37d99616d31eb9da)
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 b369f327d5e6b01a4cae9e2726df7c73b2893eba)
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 a3a94e1498685480800c22fc3ffa20d42ccfd527)
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 9d36139231bfcf155a1b94f61a420768f1771174)
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 4cc3467e7abfea7e8d03b6af511f7719038a5a98)
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 0a94020b5b073d1abf442e28b6db3be785aa680a)
2011-07-12 18:13:35 +02:00
Diego Biurrun
683df9bf54 Add LGPL license boilerplate to files lacking it.
(cherry picked from commit e3759c567db42c8dff255ef9f7258326da470755)
2011-07-12 18:13:35 +02:00
Diego Biurrun
64e2656f7c doxygen: Fix documentation for some VP8 functions.
(cherry picked from commit 3c432e1186443fae474fa4e8613fbc21fd8a6c63)
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 6c374bc0b40306c84e35a4002ab7fa96ace11c6c)
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 954a6532160b9eac7773613be105fd706d639ade)
2011-07-12 18:05:55 +02:00
Carl Eugen Hoyos
b9e126fbe2 ffmpeg: Fix VDPAU decoding for some H264 samples.
(cherry picked from commit a4ab70f92e4d8705434a2fee42a2b69a8bfa6bb1)
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 f75e3da535f297ddbe501ce866e57ccca7645455)
2011-07-12 18:05:55 +02:00
Diego Biurrun
43de5c034f doxygen: Escape '\' in Doxygen documentation.
(cherry picked from commit c81a2b9b4f5488c831dc27635152394ab632c46a)
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 082768f0b189b1706fdcd15b42dcca5fd0822315)
2011-07-07 16:51:47 +02:00
Reimar Döffinger
0a48a67e57 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>
(cherry picked from commit 4e59c8ecf1433b85b539c5e89bb68cfe8b839866)
2011-07-06 20:19:48 +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 ff993cd7fcdfeffcac10337c0c6b69c599060c2b)
2011-07-03 19:58:33 +02:00
Diego Biurrun
8f536408d1 doxygen: Remove spurious documentation for non-existing function parameters.
(cherry picked from commit 01c17c88ede76f8321cf2c59a535dbbc5b5ff989)
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 134557f3a47697a7b5e5da2bd7e5a4b8f8d56b1c)
2011-07-03 19:58:29 +02:00
Gavin Kinsey
c172eb7925 Fix segmentation fault in ffprobe
(cherry picked from commit c558122e4ee53dc4cb82f87749a9c28c38ca9401)
2011-07-03 19:49:54 +02:00