OSDN Git Service
Janne Grunau [Thu, 5 Jan 2012 21:12:35 +0000 (22:12 +0100)]
electronicarts: check bytes per sample for validity
Prevents division by zero.
Laurentiu Ion [Fri, 6 Jan 2012 18:42:00 +0000 (20:42 +0200)]
flicvideo: fix invalid reads
Prevent invalid reads using bytestream2 functions.
Fixes bug #126.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Chris Evans [Thu, 5 Jan 2012 20:25:41 +0000 (21:25 +0100)]
vorbis: Avoid some out-of-bounds reads
Fixes Bug: #190
Chromium Bug: #100543
Related to CVE-2011-3893
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Paul B Mahol [Fri, 6 Jan 2012 17:18:07 +0000 (17:18 +0000)]
vqf: add more known extensions
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diego Biurrun [Tue, 27 Dec 2011 10:37:31 +0000 (11:37 +0100)]
cabac: remove unused function renorm_cabac_decoder
Diego Biurrun [Fri, 6 Jan 2012 00:34:16 +0000 (01:34 +0100)]
h264: Only use symbols from the SVQ3 decoder under proper conditionals.
Fixes --disable-everything --enable-decoder=h264 --disable-optimizations.
Justin Ruggles [Thu, 22 Dec 2011 03:32:04 +0000 (22:32 -0500)]
add bytestream2_tell() and bytestream2_seek() functions
Janne Grunau [Thu, 5 Jan 2012 23:17:37 +0000 (00:17 +0100)]
parsers: initialize MpegEncContext.slice_context_count to 1
The mpeg4 video, H264 and VC-1 parser hold (directly or indirectly)
a MpegEncContext in their private context. Since they do not call the
common mpegvideo init function slice_context_count has explicitly set
to 1.
Prevents a null pointer dereference in the h264 parser and fixes
bug 193.
Anssi Hannula [Fri, 30 Dec 2011 20:48:18 +0000 (22:48 +0200)]
spdifenc: use special alignment for DTS-HD length_code
Align IEC 61937 length_code for DTS-HD so that
(length_code & 0xf) == 0x8. This is reportedly needed with some
receivers.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Janne Grunau [Thu, 5 Jan 2012 20:57:22 +0000 (21:57 +0100)]
ipmovie: do not read audio packets before the codec is known
Prevents a division by zero.
Janne Grunau [Thu, 5 Jan 2012 20:28:03 +0000 (21:28 +0100)]
truemotion2: check size before GetBitContext initialisation
Prevents null ptr derefence for negative sizes.
Martin Storsjö [Fri, 30 Dec 2011 09:43:10 +0000 (11:43 +0200)]
avio: Only do implicit network initialization for network protocols
The implicit network initialization is set to be removed in the
future, but is kept for compatibility. By not doing the implicit
initialization for non-network protocols, we avoid the warning
about avformat_network_init() not being called for these, where
it really doesn't make much sense.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 30 Dec 2011 09:38:05 +0000 (11:38 +0200)]
avio: Add an URLProtocol flag for indicating that a protocol uses network
This definition is in two files, since the definitions will move
to the private header at the next bump.
Signed-off-by: Martin Storsjö <martin@martin.st>
Janne Grunau [Thu, 5 Jan 2012 19:50:55 +0000 (20:50 +0100)]
adpcm: ADPCM Electronic Arts has always two channels
Chris Evans [Thu, 5 Jan 2012 20:19:30 +0000 (21:19 +0100)]
matroskadec: Fix a bug where a pointer was cached to an array that might later move due to a realloc()
Fixes bug #190
Chromium bug #100492
related to CVE-2011-3893
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Alex Converse [Thu, 5 Jan 2012 19:14:23 +0000 (11:14 -0800)]
fate: Add missing reference file from
9b4767e4.
Alex Converse [Thu, 5 Jan 2012 01:42:15 +0000 (17:42 -0800)]
mov: Support MOV_CH_LAYOUT_USE_DESCRIPTIONS for labeled descriptions.
Aneesh Dogra [Wed, 4 Jan 2012 19:58:21 +0000 (01:28 +0530)]
4xm: Prevent buffer overreads.
4xm decoder while decoding i2 frames can overread the buffer if proper checks
are not made.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Janne Grunau [Thu, 5 Jan 2012 02:47:21 +0000 (03:47 +0100)]
mjpegdec: parse RSTn to prevent skipping other data in mjpeg_decode_scan
Check explicitly if enough bits are left to prevent an infinite loop
when the bitstream buffer is not followed by zero-padding.
Based on patches by Michael Niedermayer <michaelni@gmx.at>.
Janne Grunau [Tue, 3 Jan 2012 12:56:42 +0000 (13:56 +0100)]
vp3: add fate test for non-zero last coefficient
Janne Grunau [Tue, 3 Jan 2012 12:38:01 +0000 (13:38 +0100)]
vp3: fix streams with non-zero last coefficient
Fixes a regression introduced in
8b94df0f2047e972.
Ronald S. Bultje [Thu, 5 Jan 2012 03:48:02 +0000 (19:48 -0800)]
swscale: remove unused U/V arguments from yuv2rgb_write().
Also document the function somewhat.
Diego Biurrun [Tue, 3 Jan 2012 13:52:02 +0000 (14:52 +0100)]
timer: K&R formatting cosmetics
Anton Khirnov [Thu, 5 Jan 2012 09:16:41 +0000 (10:16 +0100)]
lavf: cosmetics, reformat av_read_frame().
Anton Khirnov [Thu, 5 Jan 2012 09:14:07 +0000 (10:14 +0100)]
lavf: refactor av_read_frame() to make it easier to understand.
Oana Stratulat [Wed, 4 Jan 2012 23:08:05 +0000 (01:08 +0200)]
Report an error if pitch_lag is zero in AMR-NB decoder.
This fixes an infinite loop in the decoder on specially
crafted files, and fixes bug 151.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Ronald S. Bultje [Thu, 5 Jan 2012 05:27:31 +0000 (21:27 -0800)]
Revert "4xm: Prevent buffer overreads."
This reverts commit
295a7c0238e84b0ffa8f21ed938d45f51f54a4cd. The
patch breaks decoding of regular files (e.g. fate-4xm-2).
Aneesh Dogra [Wed, 4 Jan 2012 19:58:21 +0000 (01:28 +0530)]
4xm: Prevent buffer overreads.
4xm decoder while decoding i2 frames can overread the buffer if proper checks
are not made.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Aneesh Dogra [Wed, 4 Jan 2012 18:40:01 +0000 (00:10 +0530)]
4xm: pass the correct remaining buffer size to decode_i2_frame().
frame_size is the number of bytes left in the packet, so if we are passing
buf-4 we can safely read frame_size+4 bytes.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Aneesh Dogra [Wed, 4 Jan 2012 19:12:26 +0000 (00:42 +0530)]
4xm: fix calculation of the next output line position in decode_i2_frame().
The current code doesn't work unless width is an exact multiple of 16.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Shitiz Garg [Thu, 15 Dec 2011 19:06:27 +0000 (00:36 +0530)]
mtv: Make sure audio_subsegments is not 0
audio_subsegments would be 0 and cause floating point exceptions
Fixes bugzilla #144
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Janne Grunau [Wed, 4 Jan 2012 19:29:57 +0000 (20:29 +0100)]
v4l2: use V4L2_FMT_FLAG_EMULATED only if it is defined
V4L2_FMT_FLAG_EMULATED was added in 2.6.32.
Anton Khirnov [Sat, 26 Nov 2011 10:01:33 +0000 (11:01 +0100)]
avconv: add symbolic names for -vsync parameters
Jean First [Fri, 30 Dec 2011 20:08:02 +0000 (21:08 +0100)]
flvdec: Fix compiler warning for uninitialized variables
These can't be used uninitialized in practice, but the
compiler doesn't realize it.
Signed-off-by: Martin Storsjö <martin@martin.st>
Jean First [Tue, 3 Jan 2012 22:01:28 +0000 (23:01 +0100)]
rtsp: Fix compiler warning for uninitialized variable
This one won't ever be used uninitialized in practice, but
the compiler doesn't realize it.
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Wed, 4 Jan 2012 04:41:18 +0000 (20:41 -0800)]
ulti: convert to new bytestream API.
Diego Biurrun [Tue, 3 Jan 2012 09:29:19 +0000 (10:29 +0100)]
swscale: Use standard multiple inclusion guards in ppc/ header files.
Diego Biurrun [Tue, 3 Jan 2012 12:25:25 +0000 (13:25 +0100)]
Place some START_TIMER invocations in separate blocks.
This fixes compilation failures related to START_TIMER/STOP_TIMER macros and
-Werror=declaration-after-statement. START_TIMER declares variables and thus
may not be placed after statements outside of a new block.
Luca Barbato [Tue, 27 Dec 2011 05:31:41 +0000 (06:31 +0100)]
v4l2: list available formats
Make use of the experimental framesize enumeration ioctl if available.
Luca Barbato [Tue, 27 Dec 2011 06:41:01 +0000 (07:41 +0100)]
v4l2: set the proper codec_tag
Unbreak direct streamcopy.
Luca Barbato [Tue, 27 Dec 2011 05:27:41 +0000 (06:27 +0100)]
v4l2: refactor device_open
Check capabilities directly in the function, further simplify the code.
Luca Barbato [Tue, 27 Dec 2011 04:52:02 +0000 (05:52 +0100)]
v4l2: simplify away io_method
Only mmap is supported.
Luca Barbato [Tue, 27 Dec 2011 04:37:58 +0000 (05:37 +0100)]
v4l2: cosmetics
Luca Barbato [Tue, 27 Dec 2011 02:38:13 +0000 (03:38 +0100)]
v4l2: uniform and format options
Luca Barbato [Mon, 21 Nov 2011 16:03:46 +0000 (17:03 +0100)]
v4l2: do not force interlaced mode
Video4linux2 supports both interlaced and non-interlaced mode, do not
ask for interlaced if not necessary.
Janne Grunau [Tue, 3 Jan 2012 17:11:36 +0000 (18:11 +0100)]
avio: exit early in fill_buffer without read_packet
Fixes an invalid free() with ass in avi. The sample in bug 98 passes
parts of AVPacket.data as buffer for the AVIOContext. Since the packet
is quite large fill_buffer tries to reallocate the buffer before doing
nothing. Fixes bug 98.
John Brooks [Sun, 11 Dec 2011 09:37:21 +0000 (02:37 -0700)]
vc1dec: fix invalid memory access for small video dimensions
For small video dimensions, these calculations of the upper bound
for pixel access may have a negative result. Using an unsigned
comparison to bound a potentially negative value only works if
the greater operand is non-negative. Fixed by doing edge emulation
when the upper bound is probably negative, everywhere that this
pattern appears.
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
John Brooks [Wed, 4 Jan 2012 06:27:35 +0000 (23:27 -0700)]
rv34: fix invalid memory access for small video dimensions
For small video dimensions calculations of the upper bound for pixel
access may result in negative value. Using an unsigned comparison
works only if the greater operand is non-negative. This is fixed by
doing edge emulation explicitly for such conditions.
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Christophe GISQUET [Sun, 1 Jan 2012 14:28:47 +0000 (15:28 +0100)]
rv34: joint coefficient decoding and dequantization
Perform dequantization while decoding coefficients instead of performing it
on the entire coefficients buffer.
Since quantized coefficients are very sparse, this usually causes a small
speedup. Speedup of around 1% on Panda board compared to the removed here
neon code. Global speedup is probably around 3%.
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Martin Storsjö [Fri, 30 Dec 2011 10:39:03 +0000 (12:39 +0200)]
avplay: Don't call avio_set_interrupt_cb(NULL)
Since we don't use avio_set_interrupt_cb for interrupt callbacks,
we don't need to call it to reset the interrupt cb either.
This avoids a warning about use of deprecated functions.
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Mon, 2 Jan 2012 20:46:40 +0000 (12:46 -0800)]
swscale: remove obsolete comment.
Ronald S. Bultje [Mon, 2 Jan 2012 20:31:38 +0000 (12:31 -0800)]
swscale: split scale.asm.
scale.asm keeps horizontal scaling functions, whereas output.asm gets
the vertical scaling/output functions.
Ronald S. Bultje [Mon, 2 Jan 2012 20:03:02 +0000 (12:03 -0800)]
swscale: don't show full-chroma-int warning for non-RGB output.
Non-RGB output always uses full chroma interpolation.
Ronald S. Bultje [Tue, 3 Jan 2012 21:05:37 +0000 (13:05 -0800)]
swscale: add MMX files to MMX-OBJS instead of OBJS.
Ronald S. Bultje [Sat, 31 Dec 2011 17:12:53 +0000 (09:12 -0800)]
h264: return index in buffer on end-of-sequence.
Fixes hangs if the last packet contains an end-of-sequence NAL unit,
bug 158.
Diego Biurrun [Tue, 3 Jan 2012 12:18:49 +0000 (13:18 +0100)]
Merge some declarations and initializations.
This fixes compilation failures related to START_TIMER/STOP_TIMER macros and
-Werror=declaration-after-statement. START_TIMER declares variables and thus
may not be placed after statements outside of a new block.
Diego Biurrun [Tue, 27 Dec 2011 10:51:28 +0000 (11:51 +0100)]
cabac: drop unused and disabled get_cabac_u() / get_cabac_ueg() functions
Diego Biurrun [Tue, 27 Dec 2011 11:25:18 +0000 (12:25 +0100)]
cabac: drop unused STRICT_LIMITS code branch
Justin Ruggles [Fri, 30 Dec 2011 22:56:04 +0000 (17:56 -0500)]
libspeexenc: fix pts calculations for more than 1 frame per packet
Justin Ruggles [Tue, 3 Jan 2012 22:32:15 +0000 (17:32 -0500)]
adxdec: clear eof flag and channel states when seeking
Justin Ruggles [Mon, 19 Dec 2011 16:31:14 +0000 (11:31 -0500)]
fate: add ADX encoding/decoding test
Justin Ruggles [Mon, 19 Dec 2011 16:10:34 +0000 (11:10 -0500)]
adx: add an adx muxer
Justin Ruggles [Mon, 19 Dec 2011 15:56:18 +0000 (10:56 -0500)]
adxenc: check output buffer size before writing
Justin Ruggles [Mon, 19 Dec 2011 15:51:03 +0000 (10:51 -0500)]
adxenc: use bytestream functions for header writing.
also add more documentation about the header structure
Justin Ruggles [Mon, 19 Dec 2011 15:23:21 +0000 (10:23 -0500)]
adxenc: use BLOCK_SIZE and BLOCK_SAMPLES macros
Justin Ruggles [Mon, 19 Dec 2011 15:18:09 +0000 (10:18 -0500)]
adxenc: use a loop to encode each channel
Justin Ruggles [Mon, 19 Dec 2011 15:14:35 +0000 (10:14 -0500)]
adxenc: remove unneeded loops
avctx->frame_size is 32, so that is how many samples we process per call.
Justin Ruggles [Mon, 19 Dec 2011 15:12:29 +0000 (10:12 -0500)]
adx: add AVFMT_GENERIC_INDEX to demuxer flags.
fixes seeking
Justin Ruggles [Mon, 19 Dec 2011 14:52:32 +0000 (09:52 -0500)]
adxenc: avoid stereo deinterleaving
Justin Ruggles [Mon, 19 Dec 2011 14:45:50 +0000 (09:45 -0500)]
adxenc: remove unnecessary setting of coded_frame->key_frame.
It is already set by avcodec_alloc_frame().
Justin Ruggles [Mon, 19 Dec 2011 14:45:17 +0000 (09:45 -0500)]
adxenc: log an error message and return AVERROR(EINVAL) for invalid channels
Justin Ruggles [Mon, 19 Dec 2011 14:39:05 +0000 (09:39 -0500)]
adxenc: cosmetics: pretty-printing
Justin Ruggles [Mon, 19 Dec 2011 14:29:11 +0000 (09:29 -0500)]
adxenc: change some data types
Justin Ruggles [Mon, 19 Dec 2011 14:28:15 +0000 (09:28 -0500)]
adxenc: remove unneeded log message
Justin Ruggles [Mon, 19 Dec 2011 14:28:02 +0000 (09:28 -0500)]
adxenc: remove unneeded comments
Jonathan Nieder [Tue, 3 Jan 2012 06:40:08 +0000 (00:40 -0600)]
APIchanges: mention cleaned up header includes
Fixes bug 188.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Oana Stratulat [Sun, 1 Jan 2012 18:55:21 +0000 (20:55 +0200)]
fate: add dxtory test
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Michael Niedermayer [Sun, 18 Dec 2011 17:57:56 +0000 (18:57 +0100)]
adx_parser: rewrite.
The previous code ended in multiple different infinite
loops. See stl_ten_1_big.sfd as example with and without zzuf
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Justin Ruggles [Mon, 19 Dec 2011 13:43:10 +0000 (08:43 -0500)]
adxdec: Validate channel count to fix a division by zero.
Michael Niedermayer [Sun, 18 Dec 2011 19:10:30 +0000 (20:10 +0100)]
adxdec: Do not require extradata.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Aneesh Dogra [Sat, 31 Dec 2011 12:31:54 +0000 (18:01 +0530)]
cmdutils: K&R reformatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Justin Ruggles [Wed, 7 Dec 2011 16:56:57 +0000 (11:56 -0500)]
alacdec: implement the 2-pass prediction type.
The reference encoder does not generate any streams using this, but the
reference decoder can handle it, so we should as well.
Justin Ruggles [Wed, 7 Dec 2011 18:01:01 +0000 (13:01 -0500)]
alacenc: implement the 2-pass prediction type.
This isn't used by the reference encoder, but it is supported by the decoder.
Justin Ruggles [Wed, 7 Dec 2011 17:04:21 +0000 (12:04 -0500)]
alacenc: do not generate invalid multi-channel ALAC files
Justin Ruggles [Wed, 7 Dec 2011 16:55:24 +0000 (11:55 -0500)]
alacdec: fill in missing or guessed info about the extradata format.
Now that there is official documentation from Apple about this, we don't have
to guess anymore.
Kostya Shishkov [Sun, 1 Jan 2012 16:44:08 +0000 (17:44 +0100)]
utvideo: proper median prediction for interlaced videos
Janne Grunau [Tue, 3 Jan 2012 14:30:30 +0000 (15:30 +0100)]
lavu: bump lavu minor for av_popcount64
Add it to doc/APIchanges and update and correct other entries.
Shitiz Garg [Tue, 3 Jan 2012 10:49:28 +0000 (16:19 +0530)]
dca: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Aneesh Dogra [Sun, 1 Jan 2012 16:46:37 +0000 (22:16 +0530)]
dct: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Anton Khirnov [Mon, 2 Jan 2012 08:01:02 +0000 (09:01 +0100)]
lavf: flush decoders in avformat_find_stream_info().
This means that avformat_find_stream_info() now works properly with
multiple threads, so there's no need to force thread count to 1.
Daniel Verkamp [Sun, 1 Jan 2012 23:54:40 +0000 (23:54 +0000)]
win32: detect number of CPUs using affinity
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Daniel Verkamp [Tue, 3 Jan 2012 01:23:48 +0000 (01:23 +0000)]
Add av_popcount64
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Diego Biurrun [Mon, 2 Jan 2012 16:29:10 +0000 (17:29 +0100)]
snow: Restore three mistakenly removed casts.
Janne Grunau [Sun, 1 Jan 2012 19:24:24 +0000 (20:24 +0100)]
mpegenc: use avctx->slices as number of slices
Adds a new member to MpegEncContext to hold the number of used slice
contexts. Fixes segfaults with '-threads 17 -thread_type slice' and
fate-vsynth{1,2}-mpeg{2,4}thread{,_ilace} with --disable-pthreads.
Janne Grunau [Mon, 2 Jan 2012 14:47:26 +0000 (15:47 +0100)]
v410enc: fix undefined signed left shift caused by integer promotion
Reinhard Tartler [Mon, 2 Jan 2012 16:01:56 +0000 (17:01 +0100)]
Release notes: mention cleaned up header includes
A rebuild in debian revealed that this broke compilation of a number packages:
http://bugs.debian.org/cgi-bin/pkgreport.cgi?users=siretart@tauware.de;tag=ftbfs-libav0.8
Reinhard Tartler [Mon, 2 Jan 2012 15:58:16 +0000 (16:58 +0100)]
fix Changelog file
Both the Indeo 4 decoder and the SMJPEG demuxer were included in the
0.8_beta1 release.
Diego Biurrun [Tue, 20 Dec 2011 14:39:22 +0000 (15:39 +0100)]
Fix a bunch of typos.
Diego Biurrun [Sat, 31 Dec 2011 15:30:59 +0000 (16:30 +0100)]
Drop some pointless void* return value casts from av_malloc() invocations.
Justin Ruggles [Mon, 2 Jan 2012 13:54:30 +0000 (08:54 -0500)]
wavpack: fix typos in previous cosmetic clean-up commit