ffmpeg.git
8 years agoFix possible crash when decoding mpeg streams.
Carl Eugen Hoyos [Thu, 4 Aug 2011 09:06:43 +0000 (11:06 +0200)]
Fix possible crash when decoding mpeg streams.

This reverts 2cf8355f98681bdd726b739008acd5483f82f8d7,
fixes ticket 329.

8 years agoBink: clip AC coefficients during dequantization.
Reimar Döffinger [Sun, 17 Jul 2011 11:03:57 +0000 (13:03 +0200)]
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)

8 years agoffmpeg: fix passlogfile regression n0.7.2
Michael Niedermayer [Thu, 28 Jul 2011 16:32:26 +0000 (18:32 +0200)]
ffmpeg: fix passlogfile regression

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

8 years agoFix several security issues in matroskadec.c (MSVR-11-0080).
Michael Niedermayer [Thu, 28 Jul 2011 12:59:54 +0000 (14:59 +0200)]
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)

8 years agoffmpeg: fix prototypes of functions after the removal of OPT_FUNC2.
Baptiste Coudurier [Sun, 26 Jun 2011 21:01:00 +0000 (14:01 -0700)]
ffmpeg: fix prototypes of functions after the removal of OPT_FUNC2.
(cherry picked from commit 90a40b226a5c90e48da8041294c3782de6ee61fc)

8 years agoupdate version for 0.7.2
Michael Niedermayer [Wed, 27 Jul 2011 10:51:28 +0000 (12:51 +0200)]
update version for 0.7.2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge branch 'release/0.8' into release/0.7
Michael Niedermayer [Wed, 27 Jul 2011 09:20:13 +0000 (11:20 +0200)]
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>
8 years agoFor FFmpeg 0.7 branch: Treat AV_SAMPLE_FMT_NONE as S16 for encoders.
Reimar Döffinger [Tue, 26 Jul 2011 19:58:10 +0000 (21:58 +0200)]
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>
8 years agoFix version numbers
Michael Niedermayer [Mon, 25 Jul 2011 23:01:06 +0000 (01:01 +0200)]
Fix version numbers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/release/0.7' into release/0.8
Michael Niedermayer [Mon, 25 Jul 2011 22:14:04 +0000 (00:14 +0200)]
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>
8 years agortp: disable udp fifos, the rtp code cannot work with the fifos in its current form...
Michael Niedermayer [Mon, 25 Jul 2011 13:50:56 +0000 (15:50 +0200)]
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)

8 years agoudp: allow fifo size to be tuned seperately
Michael Niedermayer [Mon, 25 Jul 2011 13:50:13 +0000 (15:50 +0200)]
udp: allow fifo size to be tuned seperately

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

8 years agoriff: Add mpgv MPEG-2 fourcc
Alex Converse [Fri, 22 Jul 2011 17:13:22 +0000 (10:13 -0700)]
riff: Add mpgv MPEG-2 fourcc

Supported by mplayer and seen in the wild.
(cherry picked from commit 505345ed5d180093a44da8d70ac541898c31c22f)

8 years agoUpdate Changelog
Reinhard Tartler [Thu, 21 Jul 2011 07:27:23 +0000 (09:27 +0200)]
Update Changelog

8 years agomatroskadec: fix integer underflow if header length < probe length.
Chris Evans [Wed, 20 Jul 2011 00:51:48 +0000 (17:51 -0700)]
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)

8 years agoffmpeg: fix operation with --disable-avfilter
Mans Rullgard [Sun, 17 Jul 2011 14:27:14 +0000 (15:27 +0100)]
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)

8 years agovf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h
Stefano Sabatini [Fri, 15 Jul 2011 13:40:31 +0000 (15:40 +0200)]
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)

8 years agobuild: Create mlib optimization directories during out-of-tree builds.
Diego Biurrun [Mon, 20 Jun 2011 16:41:11 +0000 (18:41 +0200)]
build: Create mlib optimization directories during out-of-tree builds.

8 years agochangelog: misc typo and wording fixes
Diego Biurrun [Sat, 9 Jul 2011 15:43:53 +0000 (17:43 +0200)]
changelog: misc typo and wording fixes
(cherry picked from commit b047941d7da470ba0dcedb1fd0aa828075265ffc)

8 years agodoc: Remove outdated comments about gcc 2.95 and gcc 3.3 support.
Diego Biurrun [Sat, 9 Jul 2011 18:15:29 +0000 (20:15 +0200)]
doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support.
(cherry picked from commit 5ccbf80963c1cc54aed97b1c81b1657ab91baf6a)

8 years agomatroskadec: matroska_read_seek after after EBML_STOP leads to failure.
John Stebbins [Fri, 1 Jul 2011 15:57:42 +0000 (08:57 -0700)]
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)

8 years agoUpdate RELEASE file
Reinhard Tartler [Tue, 12 Jul 2011 16:31:28 +0000 (18:31 +0200)]
Update RELEASE file

8 years agoupdate Changelog
Reinhard Tartler [Mon, 4 Jul 2011 10:11:40 +0000 (12:11 +0200)]
update Changelog

8 years agomt: proper locking around release_buffer calls.
Ronald S. Bultje [Mon, 11 Jul 2011 00:28:28 +0000 (17:28 -0700)]
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)

8 years agovp8/mt: flush worker thread, not application thread context, on seek.
Ronald S. Bultje [Mon, 11 Jul 2011 04:23:09 +0000 (21:23 -0700)]
vp8/mt: flush worker thread, not application thread context, on seek.

This prevents a crash when seeking.
(cherry picked from commit d1cf45911935cc4fed9afd3a37d99616d31eb9da)

8 years agodocs: Mention the upstream bugzilla url about the dlltool vs MSVC issue
Martin Storsjö [Fri, 8 Jul 2011 08:00:01 +0000 (11:00 +0300)]
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)

8 years agodocs: Use proper markup for a literal command line option
Martin Storsjö [Fri, 8 Jul 2011 10:37:54 +0000 (13:37 +0300)]
docs: Use proper markup for a literal command line option

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit a3a94e1498685480800c22fc3ffa20d42ccfd527)

8 years agodocs: Don't recommend adding --enable-memalign-hack
Reinhard Tartler [Tue, 12 Jul 2011 16:09:55 +0000 (18:09 +0200)]
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)

8 years agodocs: Remove needless configure options
Martin Storsjö [Thu, 7 Jul 2011 06:51:57 +0000 (09:51 +0300)]
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>
8 years agooggdec: prevent heap corruption.
Chris Evans [Wed, 29 Jun 2011 22:44:40 +0000 (15:44 -0700)]
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)

8 years agooggdec: Abort Ogg header parsing when encountering a data packet.
Reimar Döffinger [Mon, 4 Jul 2011 00:57:47 +0000 (02:57 +0200)]
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)

8 years agoAdd LGPL license boilerplate to files lacking it.
Diego Biurrun [Sun, 3 Jul 2011 17:40:34 +0000 (19:40 +0200)]
Add LGPL license boilerplate to files lacking it.

(cherry picked from commit e3759c567db42c8dff255ef9f7258326da470755)

8 years agodoxygen: Fix documentation for some VP8 functions.
Diego Biurrun [Sun, 3 Jul 2011 14:09:37 +0000 (16:09 +0200)]
doxygen: Fix documentation for some VP8 functions.

(cherry picked from commit 3c432e1186443fae474fa4e8613fbc21fd8a6c63)

8 years agolibxvid: add missing include of libavutil/mathematics.h
Christian Schmidt [Mon, 4 Jul 2011 09:41:04 +0000 (10:41 +0100)]
libxvid: add missing include of libavutil/mathematics.h

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 6c374bc0b40306c84e35a4002ab7fa96ace11c6c)

8 years agovorbis: vpxenc: Add missing include for av_rescale*
Robert Swain [Mon, 4 Jul 2011 06:44:49 +0000 (08:44 +0200)]
vorbis: vpxenc: Add missing include for av_rescale*

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 954a6532160b9eac7773613be105fd706d639ade)

8 years agoffmpeg: Fix VDPAU decoding for some H264 samples.
Carl Eugen Hoyos [Mon, 27 Jun 2011 07:25:58 +0000 (07:25 +0000)]
ffmpeg: Fix VDPAU decoding for some H264 samples.

(cherry picked from commit a4ab70f92e4d8705434a2fee42a2b69a8bfa6bb1)

8 years agoRTSP: Doxygen comment cleanup
Diego Biurrun [Sun, 3 Jul 2011 14:35:10 +0000 (16:35 +0200)]
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)

8 years agodoxygen: Escape '\' in Doxygen documentation.
Diego Biurrun [Sun, 3 Jul 2011 14:33:25 +0000 (16:33 +0200)]
doxygen: Escape '\' in Doxygen documentation.

(cherry picked from commit c81a2b9b4f5488c831dc27635152394ab632c46a)

8 years agovf_gradfun: relicense x86 asm to LGPL
Loren Merritt [Sun, 3 Jul 2011 22:47:10 +0000 (22:47 +0000)]
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)

8 years agoFix av_open_input_stream with uninitialized context pointer.
Reimar Döffinger [Tue, 5 Jul 2011 21:10:44 +0000 (23:10 +0200)]
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)

8 years agoFix av_open_input_stream with uninitialized context pointer.
Reimar Döffinger [Tue, 5 Jul 2011 21:10:44 +0000 (23:10 +0200)]
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>
8 years agoupdate Changelog
Reinhard Tartler [Sun, 3 Jul 2011 17:54:05 +0000 (19:54 +0200)]
update Changelog

8 years agoAdd version number to doxygen config
Reinhard Tartler [Sun, 3 Jul 2011 18:00:31 +0000 (20:00 +0200)]
Add version number to doxygen config

8 years agodoxygen: Drop array size declarations from Doxygen parameter names.
Reinhard Tartler [Sun, 3 Jul 2011 17:00:59 +0000 (19:00 +0200)]
doxygen: Drop array size declarations from Doxygen parameter names.

Adding [] to a Doxygen parameter name clashes with Doxygen syntax.
(cherry picked from commit ff993cd7fcdfeffcac10337c0c6b69c599060c2b)

8 years agodoxygen: Remove spurious documentation for non-existing function parameters.
Diego Biurrun [Sun, 3 Jul 2011 14:11:16 +0000 (16:11 +0200)]
doxygen: Remove spurious documentation for non-existing function parameters.

(cherry picked from commit 01c17c88ede76f8321cf2c59a535dbbc5b5ff989)

8 years agodoxygen: fix usage of @file directive in libavutil/{dict,file}.h
Reinhard Tartler [Thu, 30 Jun 2011 21:00:46 +0000 (23:00 +0200)]
doxygen: fix usage of @file directive in libavutil/{dict,file}.h

(cherry picked from commit 134557f3a47697a7b5e5da2bd7e5a4b8f8d56b1c)

8 years agoFix segmentation fault in ffprobe
Gavin Kinsey [Tue, 21 Jun 2011 12:13:37 +0000 (13:13 +0100)]
Fix segmentation fault in ffprobe

(cherry picked from commit c558122e4ee53dc4cb82f87749a9c28c38ca9401)

8 years agoUpdate Doxyfile to the format preferred by Doxygen 1.7.1 (via 'doxygen -u').
Reinhard Tartler [Sun, 3 Jul 2011 16:58:09 +0000 (18:58 +0200)]
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 10dde477c77e0ac0fecda49fdb1dc71329aa7513)

8 years agosuggest to use av_get_bytes_per_sample() in av_get_bits_per_sample_format() doxy
Stefano Sabatini [Sat, 2 Jul 2011 11:22:35 +0000 (13:22 +0200)]
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 ccfa626db863b6019fd4c316d19d8f7018543bed)

8 years agoffmpeg: use av_get_bytes_per_sample() in place of av_get_bits_per_sample_fmt()
Stefano Sabatini [Sat, 2 Jul 2011 11:22:18 +0000 (13:22 +0200)]
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 f6d6783a4df127d2ad1cf755ac4f363decbd7fbb)

8 years agolibavformat: Add an example how to use the metadata API
Reinhard Tartler [Fri, 1 Jul 2011 18:50:33 +0000 (20:50 +0200)]
libavformat: Add an example how to use the metadata API

Also include it into the doxygen documentation
(cherry picked from commit 12489443dec228d60fa3dc56695f6ddae08beb37)

8 years agodoxygen: Prefer member groups over grouping into modules
Reinhard Tartler [Sun, 3 Jul 2011 16:55:01 +0000 (18:55 +0200)]
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 21a19b7912fe0622f3d1748ff102fcc7bc7a974a)

8 years agodoxygen: be more permissive when searching for API examples
Reinhard Tartler [Fri, 1 Jul 2011 18:53:09 +0000 (20:53 +0200)]
doxygen: be more permissive when searching for API examples

(cherry picked from commit 7655cfb1b8d8a70e8cc4b1ca811bfc3f293768d8)

8 years agoavformat: doxify the Metadata API
Reinhard Tartler [Fri, 1 Jul 2011 18:49:14 +0000 (20:49 +0200)]
avformat: doxify the Metadata API

convert the comment that documents the metadata API to use
the doxygen markup
(cherry picked from commit 1a53a438dc04e74628b39f29d3ff81ae4aa086a0)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agolavf: restore old behavior for custom AVIOContex with an AVFMT_NOFILE format.
Anton Khirnov [Fri, 24 Jun 2011 05:58:16 +0000 (07:58 +0200)]
lavf: restore old behavior for custom AVIOContex with an AVFMT_NOFILE format.

av_open_input_stream used to allow this, even though it makes no sense.
Make it just print a warning instead of failing, thus restoring
compatibility.

Note that avformat_open_input() will still reject this combination.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 4f731c4429e1fe66a5c92ff15feb63253a36d8fb)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agolavf: use the correct pointer in av_open_input_stream().
Anton Khirnov [Fri, 1 Jul 2011 19:24:17 +0000 (21:24 +0200)]
lavf: use the correct pointer in av_open_input_stream().

(cherry picked from commit 5001d6ef4a2b70fe903b1d2e3e64c6ad7cc1cfa6)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agoAdd operand size to add instructions.
Reimar Döffinger [Sun, 26 Jun 2011 11:29:17 +0000 (13:29 +0200)]
Add operand size to add instructions.

In these cases it can't be guessed from the operands (at least
not necessarily), and it seems some clang versions refuse to
compile it.
Fixes ticket #303.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
(cherry picked from commit 5c13b5bb398c12361732b7b47c71954484f5af1d)

8 years agoAdd operand size to add instructions.
Reimar Döffinger [Sun, 26 Jun 2011 11:29:17 +0000 (13:29 +0200)]
Add operand size to add instructions.

In these cases it can't be guessed from the operands (at least
not necessarily), and it seems some clang versions refuse to
compile it.
Fixes ticket #303.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
(cherry picked from commit 5c13b5bb398c12361732b7b47c71954484f5af1d)

8 years agoogg: fix double free when finding length of small chained oggs.
Ronald S. Bultje [Wed, 29 Jun 2011 05:24:21 +0000 (22:24 -0700)]
ogg: fix double free when finding length of small chained oggs.

ogg_save() copies streams[], but doesn't keep track of free()'ed
struct members. Thus, if in between a call to ogg_save() and
ogg_restore(), streams[].private was free()'ed, this would result
in a double free -> crash, which happened when e.g. playing small
chained ogg fragments.
(cherry picked from commit 9ed6cbc3ee2ae3e7472fb25192a7e36fd7b15533)

8 years agoFix possible double free when encoding using xvid.
Carl Eugen Hoyos [Fri, 1 Jul 2011 00:38:28 +0000 (02:38 +0200)]
Fix possible double free when encoding using xvid.
(cherry picked from commit 315f0e3fd8dcbd1362276b7407dad2e97cccc4b7)

8 years agoogg: fix double free when finding length of small chained oggs.
Ronald S. Bultje [Wed, 29 Jun 2011 05:24:21 +0000 (22:24 -0700)]
ogg: fix double free when finding length of small chained oggs.

ogg_save() copies streams[], but doesn't keep track of free()'ed
struct members. Thus, if in between a call to ogg_save() and
ogg_restore(), streams[].private was free()'ed, this would result
in a double free -> crash, which happened when e.g. playing small
chained ogg fragments.
(cherry picked from commit 9ed6cbc3ee2ae3e7472fb25192a7e36fd7b15533)

8 years agoFix possible double free when encoding using xvid.
Carl Eugen Hoyos [Fri, 1 Jul 2011 00:38:28 +0000 (02:38 +0200)]
Fix possible double free when encoding using xvid.
(cherry picked from commit 315f0e3fd8dcbd1362276b7407dad2e97cccc4b7)

8 years agoogg: fix double free when finding length of small chained oggs.
Ronald S. Bultje [Wed, 29 Jun 2011 05:24:21 +0000 (22:24 -0700)]
ogg: fix double free when finding length of small chained oggs.

ogg_save() copies streams[], but doesn't keep track of free()'ed
struct members. Thus, if in between a call to ogg_save() and
ogg_restore(), streams[].private was free()'ed, this would result
in a double free -> crash, which happened when e.g. playing small
chained ogg fragments.
(cherry picked from commit 9ed6cbc3ee2ae3e7472fb25192a7e36fd7b15533)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agowavpack: skip blocks with no samples
Kostya Shishkov [Tue, 28 Jun 2011 09:49:32 +0000 (11:49 +0200)]
wavpack: skip blocks with no samples

These blocks don't report audio stream parameters and they are not needed
for decoding.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit cb7b55b0962f5503f601d6b557f8945444b73395)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agoAdd new yuv444 pixfmts to avcodec_align_dimensions2
Jason Garrett-Glaser [Wed, 29 Jun 2011 01:22:23 +0000 (18:22 -0700)]
Add new yuv444 pixfmts to avcodec_align_dimensions2

Fixes draw_edges crashes with high-bit-depth 4:4:4 decoding.
(cherry picked from commit da55ee6ccc05efdd9006bb8c31db9012a3326857)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agoFix VDPAU decoding for some H264 samples.
Carl Eugen Hoyos [Mon, 27 Jun 2011 07:26:48 +0000 (09:26 +0200)]
Fix VDPAU decoding for some H264 samples.
(cherry picked from commit e747b091cbc6b41f3531cfdf9d1bdd34606b1df3)

8 years agoFix VDPAU decoding for some H264 samples.
Carl Eugen Hoyos [Mon, 27 Jun 2011 07:26:48 +0000 (09:26 +0200)]
Fix VDPAU decoding for some H264 samples.
(cherry picked from commit e747b091cbc6b41f3531cfdf9d1bdd34606b1df3)

8 years agopict_type: add a value for unknown/none.
Martin Matuska [Tue, 28 Jun 2011 11:26:56 +0000 (13:26 +0200)]
pict_type: add a value for unknown/none.

In commit bebe72f4a05d338e04ae9ca1e9c6b72749b488aa, the enum AV_PICTURE_TYPE_* was introduced. There are still places in the code where pict_type is used as an integer and there is a case where "pict_type = 0" with the explanation "let ffmpeg decide what to do". The new enum does not know a value of 0 and C++ will fail if compiling such programs anyway as it is refered as an int (and you cannot patch them properly).
(cherry picked from commit 512933671409f9f88cc9fdfc8f29525d32240bab)

8 years agopict_type: add a value for unknown/none.
Martin Matuska [Tue, 28 Jun 2011 11:26:56 +0000 (13:26 +0200)]
pict_type: add a value for unknown/none.

In commit bebe72f4a05d338e04ae9ca1e9c6b72749b488aa, the enum AV_PICTURE_TYPE_* was introduced. There are still places in the code where pict_type is used as an integer and there is a case where "pict_type = 0" with the explanation "let ffmpeg decide what to do". The new enum does not know a value of 0 and C++ will fail if compiling such programs anyway as it is refered as an int (and you cannot patch them properly).
(cherry picked from commit 512933671409f9f88cc9fdfc8f29525d32240bab)

8 years agoH.264: disable 2tap qpel with CODEC_FLAG2_FAST and >8-bit
Jason Garrett-Glaser [Sun, 26 Jun 2011 07:21:54 +0000 (00:21 -0700)]
H.264: disable 2tap qpel with CODEC_FLAG2_FAST and >8-bit

2tap qpel isn't implemented yet for high bit depth, so it just breaks decoding.
(cherry picked from commit 9a0dda8b3ab07fa7be60335715a6c350c907a7b8)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agoARM: silence some annoying armcc warnings
Mans Rullgard [Sat, 25 Jun 2011 17:51:00 +0000 (18:51 +0100)]
ARM: silence some annoying armcc warnings

This silences warnings about pointer target sign mismatches as
already done for gcc with -Wno-pointer-sign.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d0ce090ec553c88eb8e9c303156017417d4599cc)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agoconfigure: select buffersink_filter when ffmpeg is enabled
Stefano Sabatini [Fri, 24 Jun 2011 21:45:15 +0000 (23:45 +0200)]
configure: select buffersink_filter when ffmpeg is enabled

buffersink_filter is a strong requirement for compiling ffmpeg.
Fixes ffmpeg compilation with --disable-everything.
(cherry picked from commit e65d6e22e300e286bcc27443df8449aaf9d062dd)

8 years agoconfigure: select buffersink_filter when ffmpeg is enabled
Stefano Sabatini [Fri, 24 Jun 2011 21:45:15 +0000 (23:45 +0200)]
configure: select buffersink_filter when ffmpeg is enabled

buffersink_filter is a strong requirement for compiling ffmpeg.
Fixes ffmpeg compilation with --disable-everything.
(cherry picked from commit e65d6e22e300e286bcc27443df8449aaf9d062dd)

8 years agoadd changelog entries for added fourcc codecs and H.264 fixes
Reinhard Tartler [Thu, 23 Jun 2011 07:50:43 +0000 (09:50 +0200)]
add changelog entries for added fourcc codecs and H.264 fixes

8 years agobuild: Remove dependency and editor backup files also in the doc/ subdirectory.
Diego Biurrun [Thu, 23 Jun 2011 10:38:03 +0000 (12:38 +0200)]
build: Remove dependency and editor backup files also in the doc/ subdirectory.

8 years agoalsa: support unsigned variants of already supported signed formats.
Carl Eugen Hoyos [Wed, 13 Apr 2011 23:04:18 +0000 (01:04 +0200)]
alsa: support unsigned variants of already supported signed formats.

(cherry picked from commit 2359aeb52d2325ed6c28d4f7579e0999963bcec1)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agoH.264: fix 4:4:4 + deblocking + 8x8dct + cavlc + MBAFF
Jason Garrett-Glaser [Wed, 22 Jun 2011 09:34:02 +0000 (02:34 -0700)]
H.264: fix 4:4:4 + deblocking + 8x8dct + cavlc + MBAFF

(cherry picked from commit 2702a6f114f996ddfb334f1d8ddfae50e2c7eef7)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agoH.264: fix 4:4:4 + deblocking + MBAFF
Jason Garrett-Glaser [Wed, 22 Jun 2011 09:05:14 +0000 (02:05 -0700)]
H.264: fix 4:4:4 + deblocking + MBAFF

(cherry picked from commit 7c9079ab4cf0bcf34103fc9c5e49ec1fd7dd390c)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agoH.264: fix 4:4:4 cropping warning
Jason Garrett-Glaser [Tue, 21 Jun 2011 11:16:33 +0000 (04:16 -0700)]
H.264: fix 4:4:4 cropping warning

(cherry picked from commit 932db250243812380640112fd27a59bc0642bc8a)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agoH.264: reference the correct SPS in decode_scaling_matrices
Jason Garrett-Glaser [Tue, 21 Jun 2011 08:10:37 +0000 (01:10 -0700)]
H.264: reference the correct SPS in decode_scaling_matrices

(cherry picked from commit 85a88f9c0c0fcc2fc48121db1beb5ada68d24bdc)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agoH.264: fix bug in lossless 4:4:4 decoding
Jason Garrett-Glaser [Mon, 20 Jun 2011 22:56:35 +0000 (15:56 -0700)]
H.264: fix bug in lossless 4:4:4 decoding

Coefficient test for i16x16 add_pixels4 assumed luma plane.
(cherry picked from commit 3b79f2e2e928eb346dbea85cc89393dcdf010ca9)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agoalsa: add support for more formats.
Carl Eugen Hoyos [Mon, 13 Jun 2011 19:16:30 +0000 (21:16 +0200)]
alsa: add support for more formats.

Specifically, f32, f64, s32, s24, a-law and mu-law.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 921715edffbba5db8deb26b7ad3cb583ba963d03)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agorawdec: Fix decoding of QT WRAW files.
ami_stuff [Tue, 24 May 2011 21:38:01 +0000 (23:38 +0200)]
rawdec: Fix decoding of QT WRAW files.

From some tests it results that:
1. All of the AVI/MOV WRAW files need to be flipped.
2. MOV WRAW files need to use AVI color modes.
3. Assigning PAL8 mode by default to WRAW codec is not correct.
(cherry picked from commit 67e7dc54049d9b51a0c2168c8265145a9aef7780)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agoconfigure: report optimization for size separately
Mans Rullgard [Sun, 19 Jun 2011 17:41:14 +0000 (18:41 +0100)]
configure: report optimization for size separately

This removes an unsightly override of the 'optimizations' setting
only to make the configure report print 'small' when --enable-small
is used.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f082a0fb420f0367bdd00219fd0fe8fe3caf7bc7)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agomov: Support Digital Voodoo SD 8 Bit and DTS codec identifiers.
Carl Eugen Hoyos [Thu, 12 May 2011 23:08:01 +0000 (01:08 +0200)]
mov: Support Digital Voodoo SD 8 Bit and DTS codec identifiers.
(cherry picked from commit 53d5cd2c8225e251826c77f8f69a30250038fbd0)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agomov: Support R10g codec identifier.
ami_stuff [Thu, 12 May 2011 22:49:29 +0000 (00:49 +0200)]
mov: Support R10g codec identifier.
(cherry picked from commit 7ac639654f21aa78e0afa14f6c049ffa2c9078bd)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agoriff/img2: Add JPEG 2000 codec IDs.
Kamil Nowosad [Mon, 23 May 2011 21:13:34 +0000 (23:13 +0200)]
riff/img2: Add JPEG 2000 codec IDs.
(cherry picked from commit a304a833621a793bbf49b796fe1fd11ea1cd54c8)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agoriff: Add DAVC fourcc.
ami_stuff [Wed, 11 May 2011 20:18:15 +0000 (22:18 +0200)]
riff: Add DAVC fourcc.

This fourcc is used by the "mpegable AVC" codec and files encoded with
this codec decode correctly with our H.264 decoder.
(cherry picked from commit 2ea1ca1714f655a463b941b115e45a1a2f031f7b)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agoriff: Add M263, XVIX, MMJP, CDV5 fourccs.
Carl Eugen Hoyos [Sun, 24 Apr 2011 22:27:03 +0000 (00:27 +0200)]
riff: Add M263, XVIX, MMJP, CDV5 fourccs.
(cherry picked from commit 682a20114e9ee0272be764c68dc1cf251ff083da)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agorawvideo: Support auv2 fourcc.
ami_stuff [Sun, 24 Apr 2011 22:20:27 +0000 (00:20 +0200)]
rawvideo: Support auv2 fourcc.
(cherry picked from commit d352df093169f39631f1ec0017a3f186ef85f83c)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agoh264: Fix assert that failed to compile with -DDEBUG.
Diego Biurrun [Mon, 20 Jun 2011 23:11:28 +0000 (01:11 +0200)]
h264: Fix assert that failed to compile with -DDEBUG.

The assert referenced a variable that no longer exists since 4:4:4 support.
(cherry picked from commit 6371ce4b0f0535a7f576b8f109d35345e3d11d7d)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agoH.264: fix 4:4:4 + deblocking + 8x8dct + cavlc + MBAFF
Jason Garrett-Glaser [Wed, 22 Jun 2011 09:34:02 +0000 (02:34 -0700)]
H.264: fix 4:4:4 + deblocking + 8x8dct + cavlc + MBAFF
(cherry picked from commit 2702a6f114f996ddfb334f1d8ddfae50e2c7eef7)

8 years agoH.264: fix 4:4:4 + deblocking + MBAFF
Jason Garrett-Glaser [Wed, 22 Jun 2011 09:05:14 +0000 (02:05 -0700)]
H.264: fix 4:4:4 + deblocking + MBAFF
(cherry picked from commit 7c9079ab4cf0bcf34103fc9c5e49ec1fd7dd390c)

8 years agoH.264: fix 4:4:4 cropping warning
Jason Garrett-Glaser [Tue, 21 Jun 2011 11:16:33 +0000 (04:16 -0700)]
H.264: fix 4:4:4 cropping warning
(cherry picked from commit 932db250243812380640112fd27a59bc0642bc8a)

8 years agoH.264: reference the correct SPS in decode_scaling_matrices
Jason Garrett-Glaser [Tue, 21 Jun 2011 08:10:37 +0000 (01:10 -0700)]
H.264: reference the correct SPS in decode_scaling_matrices
(cherry picked from commit 85a88f9c0c0fcc2fc48121db1beb5ada68d24bdc)

8 years agoH.264: fix 4:4:4 + deblocking + 8x8dct + cavlc + MBAFF n0.7.1
Jason Garrett-Glaser [Wed, 22 Jun 2011 09:34:02 +0000 (02:34 -0700)]
H.264: fix 4:4:4 + deblocking + 8x8dct + cavlc + MBAFF
(cherry picked from commit 2702a6f114f996ddfb334f1d8ddfae50e2c7eef7)

8 years agoH.264: fix 4:4:4 + deblocking + MBAFF
Jason Garrett-Glaser [Wed, 22 Jun 2011 09:05:14 +0000 (02:05 -0700)]
H.264: fix 4:4:4 + deblocking + MBAFF
(cherry picked from commit 7c9079ab4cf0bcf34103fc9c5e49ec1fd7dd390c)

8 years agoH.264: fix 4:4:4 cropping warning
Jason Garrett-Glaser [Tue, 21 Jun 2011 11:16:33 +0000 (04:16 -0700)]
H.264: fix 4:4:4 cropping warning
(cherry picked from commit 932db250243812380640112fd27a59bc0642bc8a)

8 years agoH.264: reference the correct SPS in decode_scaling_matrices
Jason Garrett-Glaser [Tue, 21 Jun 2011 08:10:37 +0000 (01:10 -0700)]
H.264: reference the correct SPS in decode_scaling_matrices
(cherry picked from commit 85a88f9c0c0fcc2fc48121db1beb5ada68d24bdc)

8 years agorelease_notes: update for 0.7.1
Michael Niedermayer [Wed, 22 Jun 2011 21:21:19 +0000 (23:21 +0200)]
release_notes: update for 0.7.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>