OSDN Git Service
Michael Niedermayer [Wed, 25 Jan 2012 22:23:35 +0000 (23:23 +0100)]
kgv1dec: Increase offsets array size so it is large enough.
Fixes CVE-2011-3945
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
807a045ab7f51993a2c1b3116016cbbd4f3d20d6)
Signed-off-by: Alex Converse <alex.converse@gmail.com>
Alex Converse [Thu, 26 Jan 2012 16:30:49 +0000 (17:30 +0100)]
kmvc: Check palsize.
Fixes: CVE-2011-3952
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Based on fix by Michael Niedermayer
Alex Converse [Fri, 27 Jan 2012 01:23:09 +0000 (17:23 -0800)]
nsvdec: Propagate errors
Related to CVE-2011-3940.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Alex Converse [Fri, 27 Jan 2012 01:21:46 +0000 (17:21 -0800)]
nsvdec: Be more careful with av_malloc().
Check results for av_malloc() and fix an overflow in one call.
Related to CVE-2011-3940.
Based in part on work from Michael Niedermayer.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Michael Niedermayer [Tue, 24 Jan 2012 21:20:26 +0000 (22:20 +0100)]
nsvdec: Fix use of uninitialized streams.
Fixes CVE-2011-3940 (Out of bounds read resulting in out of bounds write)
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
5c011706bc752d34bc6ada31d7df2ca0c9af7c6b)
Signed-off-by: Alex Converse <alex.converse@gmail.com>
Martin Storsjö [Mon, 30 Jan 2012 14:19:15 +0000 (16:19 +0200)]
movenc: cosmetics: Get rid of camelCase identifiers
Also add spacing around operators on touched lines, and split
one line to match the common style.
Signed-off-by: Martin Storsjö <martin@martin.st>
Paul B Mahol [Mon, 30 Jan 2012 13:58:50 +0000 (13:58 +0000)]
swscale: more generic check for planar destination formats with alpha
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Martin Storsjö [Fri, 20 Jan 2012 18:33:13 +0000 (20:33 +0200)]
doc: Document mov/mp4 fragmentation options
Signed-off-by: Martin Storsjö <martin@martin.st>
Diego Biurrun [Sun, 29 Jan 2012 21:08:58 +0000 (22:08 +0100)]
build: Use order-only prerequisites for creating FATE reference file dirs.
Christophe Gisquet [Thu, 19 Jan 2012 20:48:39 +0000 (21:48 +0100)]
x86 dsputil: provide SSE2/SSSE3 versions of bswap_buf
While pshufb allows emulating bswap on XMM registers for SSSE3, more
shuffling is needed for SSE2. Alignment is critical, so specific codepaths
are provided for this case.
For the huffyuv sequence "angels_480-huffyuvcompress.avi":
C (using bswap instruction): ~ 55k cycles
SSE2: ~ 40k cycles
SSSE3 using unaligned loads: ~ 35k cycles
SSSE3 using aligned loads: ~ 30k cycles
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Mon, 30 Jan 2012 08:38:41 +0000 (09:38 +0100)]
rtsp: Remove some unused variables from ff_rtsp_connect().
Paul B Mahol [Sun, 29 Jan 2012 20:09:22 +0000 (20:09 +0000)]
avutil: make intfloat api public
The functions are already av_ prefixed and intfloat header is already provided.
Install libavutil/intfloat.h
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Rafaël Carré [Sun, 29 Jan 2012 04:29:26 +0000 (23:29 -0500)]
avformat_write_header(): detail error message
Give the exact aspect ratios when there is a mismatch between encoder
and muxer.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Mike Melanson [Mon, 30 Jan 2012 05:29:25 +0000 (21:29 -0800)]
s/vbsf/bsf/
-vbsf doesn't exist anymore. It got renamed to -bsf somewhere along the
line. Update print statement accordingly.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Mike Melanson [Mon, 30 Jan 2012 05:24:41 +0000 (21:24 -0800)]
yuv4mpeg: allow YUV4MPEG2 demuxer to recognize 'C420' colorspace.
Current demuxer recognizes several colorspace formats that begin with 'C420'
but does not yet recognize plain 'C420'. GStreamer's y4menc component
generates .y4m files with a 'C420' colorspace. This new comparison is
placed after the other 'C420' checks so that it doesn't interfere with
them.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Ronald S. Bultje [Fri, 27 Jan 2012 15:28:28 +0000 (23:28 +0800)]
png: add support for bpp>4 to paeth x86 SIMD code.
This fixes playback of e.g. RGB48 (bpp=6) content on x86 CPUs. Fixes
bug 214.
Ronald S. Bultje [Fri, 27 Jan 2012 15:23:05 +0000 (23:23 +0800)]
png: add SSE2 version for add_bytes_l2.
Ronald S. Bultje [Fri, 27 Jan 2012 15:21:55 +0000 (23:21 +0800)]
png: convert DSP functions to yasm.
Mans Rullgard [Sun, 29 Jan 2012 20:55:10 +0000 (20:55 +0000)]
Fix non-C89 declarations in for loops
Some compilers still do not support this syntax.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Ronald S. Bultje [Sun, 29 Jan 2012 20:31:59 +0000 (12:31 -0800)]
png: add missing #if HAVE_SSSE3 around function pointer assignment.
Ronald S. Bultje [Sun, 29 Jan 2012 16:14:05 +0000 (08:14 -0800)]
imdct36: mark SSE functions as using all 16 XMM registers.
On x86-64, it indeed uses all 16 registers (and on x86-32, this gets
clipped to 8). Not marking it properly causes callers of this function
to fail randomly because of XMM register clobbering.
Ronald S. Bultje [Fri, 27 Jan 2012 15:00:36 +0000 (23:00 +0800)]
png: move DSP functions to their own DSP context.
Aneesh Dogra [Sat, 28 Jan 2012 13:04:15 +0000 (18:34 +0530)]
sunrast: Add a sample request for TIFF, IFF, and Experimental Rastfile formats.
Signed-off-by: Aneesh Dogra <lionaneesh@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Aneesh Dogra [Sat, 28 Jan 2012 13:04:14 +0000 (18:34 +0530)]
sunrast: Cosmetics
Signed-off-by: Aneesh Dogra <lionaneesh@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Aneesh Dogra [Sun, 29 Jan 2012 05:25:32 +0000 (10:55 +0530)]
sunrast: Remove if (unsigned int < 0) check.
Note: This fixes the following GCC warning :-
libavcodec/sunrast.c:94: warning: comparison of unsigned expression < 0 is always false.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Aneesh Dogra [Sat, 28 Jan 2012 13:04:12 +0000 (18:34 +0530)]
sunrast: Replace magic number by a macro.
Signed-off-by: Aneesh Dogra <lionaneesh@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Nathan Caldwell [Sat, 28 Jan 2012 05:23:41 +0000 (22:23 -0700)]
aacenc: Fix LONG_START windowing.
Forgot to add the equivalent amount to the incoming sample pointer as the output pointer.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Nathan Caldwell [Sat, 28 Jan 2012 05:23:40 +0000 (22:23 -0700)]
aacenc: Fix a bug where deinterleaved samples were stored in the wrong place.
10l: Forgot to adjust deinterleave for new location of incoming samples in
7946a5a.
This produced incorrect, but surprisingly listenable results.
Thanks to Justin Ruggles for the report.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Sat, 28 Jan 2012 18:30:30 +0000 (19:30 +0100)]
avplay: use the correct array size for stride.
AV_NUM_DATA_POINTERS instead of 4.
Anton Khirnov [Sat, 28 Jan 2012 08:08:42 +0000 (09:08 +0100)]
lavc: extend doxy for avcodec_alloc_context3().
Anton Khirnov [Sat, 28 Jan 2012 08:05:55 +0000 (09:05 +0100)]
APIchanges: mention avcodec_alloc_context()/2/3
There was no minor bump for making avcodec_alloc_context3() public and
deprecating the other two, so I'm using the first next lavc bump.
Anton Khirnov [Sat, 28 Jan 2012 07:46:22 +0000 (08:46 +0100)]
avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS.
This function is video-only, so there's no point in setting more
linesizes.
Fixes stack corruption in avplay.
Mans Rullgard [Thu, 12 Jan 2012 23:44:20 +0000 (23:44 +0000)]
aacsbr: ARM NEON optimised sbrdsp functions
Overall speedup of HE-AAC decoding 2.3x on Cortex-A8, 1.2x on A9.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Fri, 13 Jan 2012 14:31:18 +0000 (14:31 +0000)]
aacsbr: align some arrays
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Thu, 12 Jan 2012 00:17:45 +0000 (00:17 +0000)]
aacsbr: move some simdable loops to function pointers
This prepares for assembly optimisations by moving the most
time-consuming loops to functions called through pointers
in a new context.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Alex Converse [Fri, 27 Jan 2012 18:36:35 +0000 (10:36 -0800)]
cosmetics: Remove extra newlines at EOF
Martin Storsjö [Thu, 19 Jan 2012 09:17:13 +0000 (11:17 +0200)]
movenc: Allow writing to a non-seekable output if using empty moov
In this mode, no seeks will be done except for within moov/moof
fragments, which should fit within the AVIOContext buffer.
This allows pushing live smooth streaming format data to
a live publishing point on IIS over http.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 20 Jan 2012 11:02:18 +0000 (13:02 +0200)]
movenc: Support adding isml (smooth streaming live) metadata
This metadata is required for pushing a live stream to an IIS
publishing point.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 26 Jan 2012 19:37:38 +0000 (21:37 +0200)]
libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set
Earlier, calling avcodec_encode_audio worked fine even if time_base
wasn't set. Now it crashes due to trying to scale the output pts to
the codec context time base. This affects e.g. VLC.
If no time_base is set for audio codecs, set it to the sample
rate.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Aneesh Dogra [Fri, 27 Jan 2012 18:15:58 +0000 (23:45 +0530)]
sunrast: Document the different Sun Raster file format types.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Aneesh Dogra [Thu, 26 Jan 2012 18:41:07 +0000 (00:11 +0530)]
sunrast: Add a check for experimental type.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Justin Ruggles [Fri, 27 Jan 2012 16:28:21 +0000 (11:28 -0500)]
libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat
Fixes build with --enable-libspeex
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_SET_PTS_INFO cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_REORDER_PRIVATE cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_SEEK_PUBLIC cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_STREAM_COPY cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_PRELOAD cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_NEW_STREAM cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_MUXRATE cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_FILESIZE cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_TIMESTAMP cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_LOOP_OUTPUT cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_LOOP_INPUT cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_FLAG_RTP_HINT cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_SDP_CREATE cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_GUESS_IMG2_CODEC cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_PKT_DUMP cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_FIND_INFO_TAG cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_PARSE_DATE cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_DUMP_FORMAT cruft
Anton Khirnov [Thu, 12 Jan 2012 12:38:58 +0000 (13:38 +0100)]
lavf: remove disabled FF_API_FORMAT_PARAMETERS cruft
Also remove now unused AVFormatParameters struct and
AVOutputFormat.set_parameters().
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_OLD_METADATA2 cruft
Anton Khirnov [Thu, 12 Jan 2012 12:31:55 +0000 (13:31 +0100)]
lavf: remove disabled FF_API_OLD_AVIO cruft
Anton Khirnov [Thu, 12 Jan 2012 10:21:02 +0000 (11:21 +0100)]
lavf: increase major version from 53 to 54.
Anton Khirnov [Thu, 12 Jan 2012 12:20:36 +0000 (13:20 +0100)]
lavf: remove AVFormatParameters from AVFormatContext.read_header signature
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_AVFRAME_AGE cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_DATA_POINTERS cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_TIFFENC_COMPLEVEL cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_INTERNAL_CONTEXT cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_PARSE_FRAME cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_GET_ALPHA_INFO cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_MJPEG_GLOBAL_OPTS cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_SNOW_GLOBAL_OPTS cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_LAME_GLOBAL_OPTS cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_AVCODEC_INIT cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_ER cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_DRC_SCALE cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_AVCODEC_OPEN cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_ALLOC_CONTEXT cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_GET_PIX_FMT_NAME cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_FLAC_GLOBAL_OPTS cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_OLD_FF_PICT_TYPES cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_THREAD_INIT cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_ANTIALIAS_ALGO cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_OLD_AUDIOCONVERT cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_OLD_SAMPLE_FMT cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_PALETTE_CONTROL cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_MPEGVIDEO_GLOBAL_OPTS cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:56:42 +0000 (10:56 +0100)]
lavc: remove disabled FF_API_X264_GLOBAL_OPTS cruft.
Anton Khirnov [Sun, 22 Jan 2012 09:48:52 +0000 (10:48 +0100)]
lavc: remove the deprecated opt.h header.
Anton Khirnov [Sun, 22 Jan 2012 09:47:48 +0000 (10:47 +0100)]
lavc: remove the deprecated "ab" option.
Anton Khirnov [Sun, 22 Jan 2012 11:49:31 +0000 (12:49 +0100)]
codec-regression: use private options instead of deprecated codec flags.
Anton Khirnov [Thu, 12 Jan 2012 10:17:23 +0000 (11:17 +0100)]
lavc: increase major version to 54.
The lavf-ffm test results change because ffmenc writes
AVCodecContext.flags/flags2 and the defaults for those change.
Alexandra Khirnova [Fri, 27 Jan 2012 08:59:00 +0000 (08:59 +0000)]
cmdutils: fix options starting with 'no'.
E.g. non_linear_quant mpeg2video private option.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Ronald S. Bultje [Fri, 27 Jan 2012 02:50:12 +0000 (10:50 +0800)]
x86inc.asm: fix typo.
Assemblers don't understand ! in %if statements.
Ronald S. Bultje [Fri, 27 Jan 2012 02:52:55 +0000 (10:52 +0800)]
swscale: convert rgb/bgr24ToY/UV_mmx functions from inline asm to yasm.
Also implement sse2/ssse3/avx versions.
Ronald S. Bultje [Mon, 23 Jan 2012 09:45:58 +0000 (17:45 +0800)]
config.asm: change %ifdef directives to %if directives.
This allows combining multiple conditionals in a single statement.