ffmpeg.git
7 years agorv10/20: tell decoder to use edge emulation
Kostya Shishkov [Wed, 17 Aug 2011 08:36:33 +0000 (10:36 +0200)]
rv10/20: tell decoder to use edge emulation

This removes out-of-edge motion compensation artifacts (easily spotted green
blocks in avplay, gray blocks in transcoding), for example here:
http://samples.libav.org/samples/real/tv_watching_t1.rm

Signed-off-by: Diego Biurrun <diego@biurrun.de>
(cherry picked from commit 331971116d7d36743601bd2dc5384c5211d3bb48)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
7 years agoflvenc: use int64_t to store offsets
Luca Barbato [Wed, 8 Jun 2011 14:32:07 +0000 (14:32 +0000)]
flvenc: use int64_t to store offsets

Metadata currently is written only at the start of the file in normal
cases, when transcoding from a rtmp source metadata could be
written later and the offset recorded can exceed 32bit.

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

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

Conflicts:

libavformat/flvenc.c

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
7 years agoVC-1: fix reading of custom PAR.
Reimar Döffinger [Sat, 13 Aug 2011 09:58:18 +0000 (11:58 +0200)]
VC-1: fix reading of custom PAR.

Custom PAR num/denum are in 1-256 range.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
(cherry picked from commit 0e8696551414d4ea0aab2559f9475d1fe49d08f3)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
7 years agoh264: notice memory allocation failure
Dustin Brody [Thu, 11 Aug 2011 12:57:58 +0000 (08:57 -0400)]
h264: notice memory allocation failure

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit bac3ab13ea6a9dd8853e79ef3eacf51d234c8774)

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

Conflicts:

libavcodec/h264.c

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
7 years agolibx264: do not set pic quality if no frame is output
Baptiste Coudurier [Sun, 30 Jan 2011 01:05:42 +0000 (17:05 -0800)]
libx264: do not set pic quality if no frame is output

Avoids uninitialized reads.

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

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
7 years agomxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
Alex Converse [Fri, 29 Jul 2011 22:27:36 +0000 (15:27 -0700)]
mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.

This prevents out of bounds reads when extradata is being decoded.
(cherry picked from commit 1f6f58d5855288492fc2640a9f1035c01c75d356)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
7 years agorv30: return AVERROR(EINVAL) instead of EINVAL
Diego Biurrun [Thu, 21 Jul 2011 12:25:01 +0000 (14:25 +0200)]
rv30: return AVERROR(EINVAL) instead of EINVAL

On some platforms EINVAL could be positive, ensure we return negative values.
(cherry picked from commit e5985185d2eda942333ebbb72bd7d043ffe40be7)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
7 years agoDo not decode RV30 files if the extradata is too small
Rafaël Carré [Sat, 16 Jul 2011 15:41:08 +0000 (11:41 -0400)]
Do not decode RV30 files if the extradata is too small

Signed-off-by: Diego Biurrun <diego@biurrun.de>
(cherry picked from commit 289c60001fb0a9a1d7a97c876d8a42b84c6874ac)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
7 years agoaacps: skip some memcpy() if src and dst would be equal
Mans Rullgard [Fri, 15 Jul 2011 21:38:10 +0000 (22:38 +0100)]
aacps: skip some memcpy() if src and dst would be equal

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

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
7 years agompegts: fix Continuity Counter error detection
Jindrich Makovicka [Thu, 30 Jun 2011 09:03:15 +0000 (09:03 +0000)]
mpegts: fix Continuity Counter error detection

According to MPEG-TS specs, the continuity_counter shall not be
incremented when the adaptation_field_control of the packet
equals '00' or '10'.

Signed-off-by: Jindrich Makovicka <jindrich.makovicka@nangu.tv>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 8923cfa328e8eb565aebcfe8672b276fd1c19bf7)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
7 years agoalsa: fallback to buffer_size/4 for period_size.
Justin Ruggles [Wed, 22 Jun 2011 19:33:56 +0000 (15:33 -0400)]
alsa: fallback to buffer_size/4 for period_size.

buffer_size/4 is the value used by aplay. This fixes output to null
devices, e.g. writing ALSA output to a file.
(cherry picked from commit 8bfd7f6a475225a0595bf657f8b99a8fffb461e4)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
7 years agomxfenc: fix ignored drop flag in binary timecode representation.
Clément Bœsch [Mon, 4 Jul 2011 08:19:46 +0000 (10:19 +0200)]
mxfenc: fix ignored drop flag in binary timecode representation.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 4d5e7ab5c48451404038706ef3113c9925a83087)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
7 years agodca: set AVCodecContext frame_size for DTS audio
John Stebbins [Mon, 4 Jul 2011 16:55:19 +0000 (09:55 -0700)]
dca: set AVCodecContext frame_size for DTS audio

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 49c7006c7e815d4330247624a9e6ba30e288cd02)

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

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
7 years agoH.264: fix overreads of qscale_table
Jason Garrett-Glaser [Mon, 4 Jul 2011 13:05:34 +0000 (06:05 -0700)]
H.264: fix overreads of qscale_table

filter_mb_fast assumed that qscale_table was padded like many of the other tables.
(cherry picked from commit 5029a406334ad0eaf92130e23d596e405a8a5aa0)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
7 years agopostprocess.c: filter name needs to be double 0 terminated
Piotr Kaczuba [Mon, 30 May 2011 11:19:35 +0000 (13:19 +0200)]
postprocess.c: filter name needs to be double 0 terminated

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit f4f3300c09bb13eb7922e60888b55e3e0fb325e7)
(cherry picked from commit 20ca827019a72bfacb38e73d0b8590e651818272)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
7 years agoReplace strncpy() with av_strlcpy() in libpostproc.
Alex Converse [Tue, 3 May 2011 18:19:31 +0000 (11:19 -0700)]
Replace strncpy() with av_strlcpy() in libpostproc.

(cherry picked from commit 1a5e4fd8c5b99478b4e08a69261930bb12aa948b)

Conflicts:

ffmpeg.c
libavcodec/ac3enc.c
libavcodec/ass.c
libavformat/movenc.c
libavformat/mp3enc.c
libavutil/log.c

7 years agojpegdec: actually search for and parse RSTn
Michael Niedermayer [Thu, 9 Jun 2011 01:35:50 +0000 (03:35 +0200)]
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 8c0fa61a9713a1306fca7997dd04d72ea1f060ea)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
7 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)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
7 years agoAdded M701 codec_tag for mpeg2video
Tomas Härdin [Mon, 7 Jun 2010 11:27:26 +0000 (11:27 +0000)]
Added M701 codec_tag for mpeg2video

Originally committed as revision 23513 to svn://svn.ffmpeg.org/ffmpeg/trunk
(cherry picked from commit 77d3f1f792c2a0bd455c75b0aa8e356b3a470ea7)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
7 years agoupdate version
Reinhard Tartler [Sat, 5 Nov 2011 12:01:01 +0000 (13:01 +0100)]
update version

7 years agoRelease notes and changelog for 0.6.3
Reinhard Tartler [Sat, 5 Nov 2011 11:46:18 +0000 (12:46 +0100)]
Release notes and changelog for 0.6.3

7 years agoFix memory (re)allocation in matroskadec.c, related to MSVR-11-0080.
Michael Niedermayer [Thu, 28 Jul 2011 12:59:54 +0000 (14:59 +0200)]
Fix memory (re)allocation in matroskadec.c, related to 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)

Further suggestions from Kostya <kostya.shishkov@gmail.com> have been
implemented by Reinhard Tartler <siretart@tauware.de>

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 77d2ef13a8fa630e5081f14bde3fd20f84c90aec)

NB: MSVR-11-0080 doesn't seem to exist. This issue seems to be known
as MSVR11-011 instead.

Fixes: CVE-2011-3504

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
7 years agocavs: fix some crashes with invalid bitstreams
Mans Rullgard [Wed, 10 Aug 2011 17:52:11 +0000 (18:52 +0100)]
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 4a71da0f3ab7f5542decd11c81994f849d5b2c78)

Fixes CVE-2011-3362, CVE-2011-3973, CVE-2011-3974

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
7 years agolibvo-aacenc: Sync up with 0.7.2
Reinhard Tartler [Sat, 5 Nov 2011 11:19:43 +0000 (12:19 +0100)]
libvo-aacenc: Sync up with 0.7.2

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>
7 years agoFix MMX rgb24 to yuv conversion with gcc 4.6
Mans Rullgard [Sun, 13 Feb 2011 00:19:06 +0000 (00:19 +0000)]
Fix MMX rgb24 to yuv conversion with gcc 4.6

When built with gcc 4.6, the MMX rgb24 to yuv conversion gives
wrong output.  The compiler produces this warning:

libswscale/swscale_template.c:1885:5: warning: use of memory input without lvalue in asm operand 4 is deprecated

Changing the memory operand to a register makes it work.

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

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agooggdec: prevent heap corruption.
Chris Evans [Thu, 4 Aug 2011 20:00:29 +0000 (22:00 +0200)]
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 agoFix ff_imdct_calc_sse() on gcc-4.6
Reinhard Tartler [Mon, 25 Jul 2011 07:38:48 +0000 (09:38 +0200)]
Fix ff_imdct_calc_sse() on gcc-4.6

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 770c410fbb8e1b87ce8ad7f3d7eddaa55e2b8295)

References:
http://bugs.debian.org/635324

Conflicts:

libavcodec/x86/fft_sse.c

8 years agobackport libvo-aacenc wrapper for aac encoding
Reinhard Tartler [Fri, 13 May 2011 10:43:40 +0000 (12:43 +0200)]
backport libvo-aacenc wrapper for aac encoding

8 years agoRelease notes for 0.6.3
Reinhard Tartler [Sat, 30 Apr 2011 07:00:46 +0000 (09:00 +0200)]
Release notes for 0.6.3

8 years agoupdate Changelog
Reinhard Tartler [Sat, 30 Apr 2011 06:44:07 +0000 (08:44 +0200)]
update Changelog

8 years agoAMV: disable DR1 and don't override EMU_EDGE
Michael Niedermayer [Thu, 28 Apr 2011 19:10:04 +0000 (21:10 +0200)]
AMV: disable DR1 and don't override EMU_EDGE

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 89f903b3d5ec38c9c5d90fba7e626fa0eda61a32)
(cherry picked from commit 9b919571e506fbb72b81a35ca1e7c1bd6efc4209)
(cherry picked from commit 7089265756a84bf884a7c2290c6cda38d4dfd60f)

Signed-off-by: Reinhard Tartler <siretart@sandy.tauware.de>
8 years agolavf: inspect more frames for fps when container time base is coarse
Reinhard Tartler [Sat, 30 Apr 2011 06:18:32 +0000 (08:18 +0200)]
lavf: inspect more frames for fps when container time base is coarse

As per issue2629, most 23.976fps matroska H.264 files are incorrectly
detected as 24fps, as the matroska timestamps usually have only
millisecond precision.

Fix that by doubling the amount of timestamps inspected for frame rate
for streams that have coarse time base. This also fixes 29.970 detection
in matroska.

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

Tested with mplayer based on this report
http://thread.gmane.org/gmane.comp.video.mplayer.user/66043/focus=66063

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 7c152a458d3fb0a2fb1aef1f05bfee90fe70697e)

8 years agoFix races in default av_log handler
Reinhard Tartler [Sat, 30 Apr 2011 06:11:13 +0000 (08:11 +0200)]
Fix races in default av_log handler

Prevent competing threads from overwriting (shared) buffers.

Original patch by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0247bdee2581a6857a24c5ff297f01d3a3112b11)

8 years agoaac: add headers needed for log2f()
Michael Niedermayer [Sat, 23 Apr 2011 08:44:21 +0000 (10:44 +0200)]
aac: add headers needed for log2f()

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 30fe9719344f01a147628e07a8e79a9ccc7e0835)

8 years agomjpeg: Detect overreads in mjpeg_decode_scan() and error out.
Michael Niedermayer [Thu, 21 Apr 2011 20:03:24 +0000 (22:03 +0200)]
mjpeg: Detect overreads in mjpeg_decode_scan() and error out.

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 0d9cba562b88899f0769e686d19b7953f589069b)

8 years agoSupport writing 2d float arrays.
Michael Kostylev [Thu, 13 May 2010 10:02:04 +0000 (10:02 +0000)]
Support writing 2d float arrays.

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 56b37cd1c7f3b5e5a3ece043c7ffccf70874cfb1)

Unbreaks compilation since the HE-AAC v2 backport
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agoAdd missing dependencies for the AAC-HE backport for hardcoded tables
Reinhard Tartler [Tue, 22 Mar 2011 19:57:36 +0000 (20:57 +0100)]
Add missing dependencies for the AAC-HE backport for hardcoded tables

Unbreaks compilation with --enable-hardcoded-tables

8 years agoconfigure: Add the -D parameter to the dlltool command
Martin Storsjö [Mon, 21 Mar 2011 20:41:38 +0000 (22:41 +0200)]
configure: Add the -D parameter to the dlltool command

This is required for the generated .lib file to actually
be usable by MSVC.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 77e41e047dc487e318a0a47e02cfa99d25459b8a)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agoSet the correct target for mingw64 dlltool
Luca Barbato [Mon, 21 Mar 2011 19:22:51 +0000 (20:22 +0100)]
Set the correct target for mingw64 dlltool

That fixes .lib creation for the win64 target.
(cherry picked from commit 417516f63f8a9ee214ee9fa6fcb483962ea0f096)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agoconfigure: use dlltools instead of lib.exe
Luca Barbato [Thu, 17 Mar 2011 01:54:12 +0000 (02:54 +0100)]
configure: use dlltools instead of lib.exe

This way building ffmpeg on mingw won't require windows specific tools
(cherry picked from commit ec10a9ab461b26b96eff7bbbb8623f42d8ee04ad)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agorelease notes and changelog for 0.6.2
Reinhard Tartler [Fri, 18 Mar 2011 17:01:41 +0000 (18:01 +0100)]
release notes and changelog for 0.6.2

8 years agopartially rename FFmpeg to Libav
Reinhard Tartler [Fri, 18 Mar 2011 17:10:32 +0000 (18:10 +0100)]
partially rename FFmpeg to Libav

update mailing list references and irc channels in configure
(cherry picked from commit 070c5d0f3530c16c92b81f3f0de2943410367c00)

8 years agoconsolidate .gitignore patters into a single file
Janne Grunau [Tue, 18 Jan 2011 19:44:24 +0000 (20:44 +0100)]
consolidate .gitignore patters into a single file

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 2c3589bfda036c7827ded0bf38b16dfe7630bae1)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
8 years agoconvert svn:ignore properties to .gitignore files
Janne Grunau [Mon, 17 Jan 2011 14:49:11 +0000 (15:49 +0100)]
convert svn:ignore properties to .gitignore files

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 348b8218f7a59374355c966dbe3b851a7275f952)

8 years agoDo not attempt to decode APE file with no frames
Kostya [Tue, 15 Mar 2011 09:19:43 +0000 (09:19 +0000)]
Do not attempt to decode APE file with no frames

This fixes invalid reads/writes with this sample:
http://packetstorm.linuxsecurity.com/1103-exploits/vlc105-dos.txt
(cherry picked from commit 8312e3fc9041027a33c8bc667bb99740fdf41dd5)

8 years agoFix invalid reads in VC1 decoder
Reimar Döffinger [Sat, 19 Feb 2011 10:33:01 +0000 (11:33 +0100)]
Fix invalid reads in VC1 decoder

Patch discussed and taken from https://roundup.ffmpeg.org/issue2584
(cherry picked from commit 2bbec1eda46d907605772a8b6e8263caa4bc4c82)

Change related to CVE-2011-0723

8 years agoBump version number for 0.6.2 release.
Reinhard Tartler [Fri, 18 Mar 2011 15:59:07 +0000 (16:59 +0100)]
Bump version number for 0.6.2 release.

8 years agoCheck rangebits to avoid a possible crash.
Frank Barchard [Sat, 15 Jan 2011 16:19:06 +0000 (16:19 +0000)]
Check rangebits to avoid a possible crash.

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 13184036a6b1b1d4b61c91118c0896e9ad4634c3)

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
8 years agoFix crashes in vorbis decoding found by zzuf
Jason Garrett-Glaser [Wed, 27 Oct 2010 16:30:01 +0000 (16:30 +0000)]
Fix crashes in vorbis decoding found by zzuf

Fixes issue 2322.

Originally committed as revision 25591 to svn://svn.ffmpeg.org/ffmpeg/trunk
(cherry picked from commit 3dde66752d59dfdd0f3727efd66e7202b3c75078)

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
9 years agoslight rewording for the release focus description
Diego Biurrun [Mon, 18 Oct 2010 19:46:51 +0000 (19:46 +0000)]
slight rewording for the release focus description

Originally committed as revision 25524 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoRewording for the 0.6.1 release notes.
Diego Biurrun [Mon, 18 Oct 2010 11:28:24 +0000 (11:28 +0000)]
Rewording for the 0.6.1 release notes.

Originally committed as revision 25514 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agosmall spelling fixes
Diego Biurrun [Mon, 18 Oct 2010 10:52:44 +0000 (10:52 +0000)]
small spelling fixes

Originally committed as revision 25513 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoupdate version for 0.6.1 v0.6.1
Reinhard Tartler [Wed, 13 Oct 2010 12:44:47 +0000 (12:44 +0000)]
update version for 0.6.1

Originally committed as revision 25469 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoadd note about flic fix (CVE-2010-3429) to RELEASE notes
Reinhard Tartler [Wed, 13 Oct 2010 12:43:18 +0000 (12:43 +0000)]
add note about flic fix (CVE-2010-3429) to RELEASE notes

Originally committed as revision 25468 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoadd note about flic fix (CVE-2010-3429)
Reinhard Tartler [Wed, 13 Oct 2010 12:42:38 +0000 (12:42 +0000)]
add note about flic fix (CVE-2010-3429)

Originally committed as revision 25467 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoFix several security issues in flicvideo.c
Reinhard Tartler [Sat, 2 Oct 2010 07:42:42 +0000 (07:42 +0000)]
Fix several security issues in flicvideo.c
This fixes CVE-2010-3429

backport r25223 by michael

Originally committed as revision 25307 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoproperty changes from the AAC backport
Reinhard Tartler [Sat, 2 Oct 2010 07:35:56 +0000 (07:35 +0000)]
property changes from the AAC backport

Originally committed as revision 25306 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoclarify addition of VP80 fourcc code
Reinhard Tartler [Sat, 31 Jul 2010 21:56:15 +0000 (21:56 +0000)]
clarify addition of VP80 fourcc code

Originally committed as revision 24636 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoupdate release notes for the upcoming 0.6.1 point release
Reinhard Tartler [Sat, 31 Jul 2010 21:55:38 +0000 (21:55 +0000)]
update release notes for the upcoming 0.6.1 point release

Originally committed as revision 24635 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoupdate changelog for upcoming 0.6.1 point release
Reinhard Tartler [Sat, 31 Jul 2010 21:13:20 +0000 (21:13 +0000)]
update changelog for upcoming 0.6.1 point release

Originally committed as revision 24633 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoBackport AAC-HE v2 from trunk
Reinhard Tartler [Wed, 28 Jul 2010 20:14:28 +0000 (20:14 +0000)]
Backport AAC-HE v2 from trunk

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

9 years agoaviobuf: Do short seeks forward by reading and skipping data instead of a proper...
Reinhard Tartler [Mon, 19 Jul 2010 19:51:29 +0000 (19:51 +0000)]
aviobuf: Do short seeks forward by reading and skipping data instead of a proper seek

This improves performance on e.g. seekable http.

backport r24280 by mstorsjo

Originally committed as revision 24335 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoac3: make the value of codec_id during (E-)AC-3 parsing stay CODEC_ID_EAC3
Reinhard Tartler [Fri, 9 Jul 2010 01:16:42 +0000 (01:16 +0000)]
ac3: make the value of codec_id during (E-)AC-3 parsing stay CODEC_ID_EAC3
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

9 years agoAdd VP80 fourcc
Google [Mon, 28 Jun 2010 20:38:36 +0000 (20:38 +0000)]
Add VP80 fourcc

Patch by Google

backport r23193 by conrad

Originally committed as revision 23863 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoDoxygen av_codec_get_id() and av_codec_get_tag().
Reinhard Tartler [Sat, 26 Jun 2010 15:32:27 +0000 (15:32 +0000)]
Doxygen av_codec_get_id() and av_codec_get_tag().

backport r23102 by stefano

Originally committed as revision 23801 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoSome fields were incorrectly reset (to NULL) when calling avcodec_copy_context().
Jean-Daniel Dupas [Sat, 26 Jun 2010 14:24:14 +0000 (14:24 +0000)]
Some fields were incorrectly reset (to NULL) when calling avcodec_copy_context().

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

9 years ago10l: aacsbr: Fix f_master[2] calculation when k2diff == -1.
Reinhard Tartler [Thu, 24 Jun 2010 05:46:58 +0000 (05:46 +0000)]
10l: aacsbr: Fix f_master[2] calculation when k2diff == -1.

backport r23660 by alexc

Originally committed as revision 23747 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoFix two small typos.
Diego Biurrun [Mon, 21 Jun 2010 09:17:19 +0000 (09:17 +0000)]
Fix two small typos.

Originally committed as revision 23678 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoremove note that libvpx was considered (L)GPL incompatible
Reinhard Tartler [Wed, 16 Jun 2010 06:10:30 +0000 (06:10 +0000)]
remove note that libvpx was considered (L)GPL incompatible

Originally committed as revision 23623 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoconfigure: fix symver detection with icc 10 v0.6
Reinhard Tartler [Tue, 15 Jun 2010 19:44:30 +0000 (19:44 +0000)]
configure: fix symver detection with icc 10

Apparently the compiler sometimes bypasses the normal assembler, in
which case the asm label variant works.  If the file contains any
inline asm, this bypassing is not done, and the assembler chokes on
invalid syntax.  Inserting a dummy asm() statement in the test when
the compiler supports it makes sure no shortcuts are taken and the
test fails as it should.

backport r23616 by mru

Originally committed as revision 23618 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoFix symbol version compat wrappers on systems with export prefixes
Reinhard Tartler [Tue, 15 Jun 2010 19:44:09 +0000 (19:44 +0000)]
Fix symbol version compat wrappers on systems with export prefixes

backport r23615 by mru

Originally committed as revision 23617 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoAdd compatibility wrappers for functions moved from lavf to lavc
Reinhard Tartler [Tue, 15 Jun 2010 13:31:27 +0000 (13:31 +0000)]
Add compatibility wrappers for functions moved from lavf to lavc

When symbol versioning is enabled, moving symbols from one library to
another breaks binary compatibility.  This adds wrappers with the old
version tag for the av_*packet functions recently moved to lavc.

backport r23611 by mru

Originally committed as revision 23613 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agorevert r23610, better patch is pending
Reinhard Tartler [Tue, 15 Jun 2010 13:29:20 +0000 (13:29 +0000)]
revert r23610, better patch is pending

Originally committed as revision 23612 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoadd symver hacks for gnu linkers
Reinhard Tartler [Tue, 15 Jun 2010 12:29:19 +0000 (12:29 +0000)]
add symver hacks for gnu linkers

this patch restores binary compatibility for the av_*_packet symbols that have
been moved from libavformat to libavcodec.  This patch works for gnu toolchains
only; support for ARM RCVT will be handed in for a later point release as soon
as the patch is ready and approved by the ARM maintainer(s).

Originally committed as revision 23610 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoremove redundant changelog entry
Reinhard Tartler [Thu, 10 Jun 2010 08:10:32 +0000 (08:10 +0000)]
remove redundant changelog entry

Originally committed as revision 23560 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agolibrtmp may link to different ssl implementations
Reinhard Tartler [Wed, 9 Jun 2010 15:55:02 +0000 (15:55 +0000)]
librtmp may link to different ssl implementations

Make sure we link using the right libs by using pkg-config

backport r23511 by lu_zero

Originally committed as revision 23550 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoAdd WebM muxer
James Zern [Wed, 9 Jun 2010 15:54:27 +0000 (15:54 +0000)]
Add WebM muxer

Patch by James Zern <jzern at google>

backport r23474 by conrad

Originally committed as revision 23549 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agolibvpx now has an (L)GPL-compatible license.
Reinhard Tartler [Sat, 5 Jun 2010 13:58:13 +0000 (13:58 +0000)]
libvpx now has an (L)GPL-compatible license.

backport r23482 by diego

Originally committed as revision 23487 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoupdate RELEASE notes
Reinhard Tartler [Sat, 5 Jun 2010 08:30:55 +0000 (08:30 +0000)]
update RELEASE notes

VP8 license issues seem to have solved, plus include wording suggestion
from discussion on -cvslog

Originally committed as revision 23483 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoVP8 encoding via libvpx.
James Zern [Thu, 3 Jun 2010 21:36:38 +0000 (21:36 +0000)]
VP8 encoding via libvpx.

Patch by James Zern, Google, Inc.

backport r23449 by cehoyos

Originally committed as revision 23455 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoAdd an entry to APIchanges for the addition of sws_convertPalette8ToPacked32 -24
Reinhard Tartler [Thu, 3 Jun 2010 20:16:42 +0000 (20:16 +0000)]
Add an entry to APIchanges for the addition of sws_convertPalette8ToPacked32 -24

backport r23415 by siretart

Originally committed as revision 23446 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoupdates: introductionary and more general notes, add missing items from changelog
Reinhard Tartler [Wed, 2 Jun 2010 09:25:37 +0000 (09:25 +0000)]
updates: introductionary and more general notes, add missing items from changelog

Originally committed as revision 23420 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agodisable (native) vorbis encoder for the 0.6 branch
Reinhard Tartler [Tue, 1 Jun 2010 20:14:00 +0000 (20:14 +0000)]
disable (native) vorbis encoder for the 0.6 branch

Originally committed as revision 23416 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoffmpeg: offer alternatives for experimental codecs if they exist
Reinhard Tartler [Tue, 1 Jun 2010 06:29:50 +0000 (06:29 +0000)]
ffmpeg: offer alternatives for experimental codecs if they exist

backport r23398 by janne

Originally committed as revision 23400 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoffmpeg: fail if user selected codec is experimental and strict_std_compliance > exper...
Reinhard Tartler [Tue, 1 Jun 2010 06:28:19 +0000 (06:28 +0000)]
ffmpeg: fail if user selected codec is experimental and strict_std_compliance > experimental

backport r23397 by janne

Originally committed as revision 23399 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoAdd a short note about libvpx.
Reinhard Tartler [Mon, 31 May 2010 21:49:53 +0000 (21:49 +0000)]
Add a short note about libvpx.

backport r23394 by diego

Originally committed as revision 23395 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoRequire --enable-nonfree flag for libvpx.
Diego Biurrun [Sun, 30 May 2010 22:25:40 +0000 (22:25 +0000)]
Require --enable-nonfree flag for libvpx.

The license of libvpx is incompatible with the (L)GPL.  As long as this is
the case, the only way to use it is by marking the result as nonfree.

backport r23371 by diego

Originally committed as revision 23390 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoTreat SIPP like xvid, fixed issue1966
Reinhard Tartler [Sat, 29 May 2010 15:07:08 +0000 (15:07 +0000)]
Treat SIPP like xvid, fixed issue1966

backport r23336 by michael

Originally committed as revision 23385 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoSamsung uses SIPP as FourCC for MPEG-4 ASP.
Reinhard Tartler [Sat, 29 May 2010 14:45:13 +0000 (14:45 +0000)]
Samsung uses SIPP as FourCC for MPEG-4 ASP.

backport r23309 by cehoyos

Originally committed as revision 23384 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoffserver: Send a Content-Base header in the reply to RTSP DESCRIBE requests
Reinhard Tartler [Sat, 29 May 2010 14:41:26 +0000 (14:41 +0000)]
ffserver: Send a Content-Base header in the reply to RTSP DESCRIBE requests

This is needed for QuickTime Player to be able to connect properly.

backport r23325 by mstorsjo

Originally committed as revision 23383 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agobackport latest ffserver fixes like memory leaks and invalid reads
Reinhard Tartler [Sat, 29 May 2010 14:40:31 +0000 (14:40 +0000)]
backport latest ffserver fixes like memory leaks and invalid reads

Patches by Howard Chu, hyc at highlandsun dot com

backport r23290-23295 by mstorsjo

Originally committed as revision 23382 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoMark vorbis encoder as experimental.
Reinhard Tartler [Sat, 29 May 2010 14:34:37 +0000 (14:34 +0000)]
Mark vorbis encoder as experimental.

backport r23339 by cehoyos

Originally committed as revision 23381 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoMark AAC encoder as experimental.
Reinhard Tartler [Sat, 29 May 2010 14:33:50 +0000 (14:33 +0000)]
Mark AAC encoder as experimental.

backport r23350 by alexc

Originally committed as revision 23380 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoAdd CODEC_CAP_EXPERIMENTAL and prefer encoders without it.
Janne Grunau [Sat, 29 May 2010 14:33:02 +0000 (14:33 +0000)]
Add CODEC_CAP_EXPERIMENTAL and prefer encoders without it.

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

9 years agoCheck for VUI overeading and reset num_reoder_frames.
Reinhard Tartler [Sat, 29 May 2010 14:25:18 +0000 (14:25 +0000)]
Check for VUI overeading and reset num_reoder_frames.
This helps the video from issue1831

backport r23328 by michael

Originally committed as revision 23378 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoapi-example: Try to avoid decoding incomplete frames
Reinhard Tartler [Sat, 29 May 2010 14:20:05 +0000 (14:20 +0000)]
api-example: Try to avoid decoding incomplete frames

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

9 years agomatroska: Add V_VP8
Google [Sat, 29 May 2010 14:11:03 +0000 (14:11 +0000)]
matroska: Add V_VP8

Patch by Google

backport r23192 by conrad

Originally committed as revision 23376 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoFix VP8 listing in general.texi
Reinhard Tartler [Sat, 29 May 2010 14:05:05 +0000 (14:05 +0000)]
Fix VP8 listing in general.texi

backport r23306 by mstorsjo

Originally committed as revision 23375 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6

9 years agoVP8 decoding via libvpx
James Zern [Sat, 29 May 2010 14:03:03 +0000 (14:03 +0000)]
VP8 decoding via libvpx

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

9 years agoDisplay a more descriptive log message when probe buffer limit is
Reinhard Tartler [Sat, 29 May 2010 13:11:56 +0000 (13:11 +0000)]
Display a more descriptive log message when probe buffer limit is
reached.

backport r23288 by jai_menon

Originally committed as revision 23373 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6