OSDN Git Service
Michael Niedermayer [Mon, 26 Mar 2012 13:05:02 +0000 (15:05 +0200)]
mxfdec: fix off by one error.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 26 Mar 2012 02:22:34 +0000 (02:22 +0000)]
libopenjpegdec: refactor some code and fix memory leaks
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 26 Mar 2012 02:01:23 +0000 (02:01 +0000)]
libopenjpegdec: always check image because decoding may still fail
Fixes bunch of segfaults.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 25 Mar 2012 23:33:53 +0000 (23:33 +0000)]
libopenjpegenc: allow changing encoding parameters
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 25 Mar 2012 23:33:52 +0000 (23:33 +0000)]
libopenjpegenc: merge common code
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 25 Mar 2012 23:33:51 +0000 (23:33 +0000)]
libopenjpegenc: use pix_fmt descriptor to get bpp
This will also simplify adding support for RGB565 and similar.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 25 Mar 2012 23:33:50 +0000 (23:33 +0000)]
libopenjpegenc: use pix_fmt descriptor to get numcomps
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 26 Mar 2012 01:46:06 +0000 (03:46 +0200)]
indeo4: better mv check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 26 Mar 2012 00:24:36 +0000 (02:24 +0200)]
indeo5: check motion vectors.
fixes out of frame reading
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 26 Mar 2012 01:03:02 +0000 (03:03 +0200)]
mxfdec: pass correct context to av_timecode_init()
fixes null ptr dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 25 Mar 2012 21:18:19 +0000 (21:18 +0000)]
vf_hflip: accept PIX_FMT_RGB444 and PIX_FMT_BGR444 pixel formats
Signed-off-by: Paul B Mahol <onemda@gmail.com>
added fate checksum update
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 25 Mar 2012 10:55:49 +0000 (10:55 +0000)]
png: fix warning about discarding qualifiers [-Wincompatible-pointer-types]
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Aaron Colwell [Thu, 22 Mar 2012 19:37:47 +0000 (12:37 -0700)]
pthread : Remove lock/unlock pairs in worker loop to avoid unexpected state changes.
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 25 Mar 2012 21:10:30 +0000 (23:10 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: prettyprint gcc inline asm
x86: K&R prettyprinting cosmetics for dsputil_mmx.c
x86: conditionally compile H.264 QPEL optimizations
dsputil_mmx: Surround QPEL macros by "do { } while (0);" blocks.
Ignore generated files below doc/.
dpcm: convert to bytestream2.
interplayvideo: convert to bytestream2.
movenc: Merge if statements
h264: fix memleak in error path.
pthread: Immediately release all frames in ff_thread_flush()
h264: Add check for invalid chroma_format_idc
utvideo: port header reading to bytestream2.
Conflicts:
.gitignore
configure
libavcodec/h264_ps.c
libavcodec/interplayvideo.c
libavcodec/pthread.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 25 Mar 2012 19:50:49 +0000 (21:50 +0200)]
swr-test: test the new flexible buffering
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 25 Mar 2012 19:50:00 +0000 (21:50 +0200)]
swr: realloc_audio: support packed audio buffers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 25 Mar 2012 19:04:48 +0000 (21:04 +0200)]
swr: More flexible and convenient buffering
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Julien Ramseier [Sun, 25 Mar 2012 14:38:57 +0000 (16:38 +0200)]
Fix SVCD scan_offset option
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 21 Mar 2012 22:18:54 +0000 (22:18 +0000)]
"Metal Gear Solid: The Twin Snakes" demuxer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Philip Langdale [Sat, 24 Mar 2012 21:14:51 +0000 (14:14 -0700)]
CrystalHD: Remove EXPERIMENTAL flag for known good formats.
With the flag in place, it's hard to actually use the decoder, and
I'm happy with how it works, with the exception of DivX3 where I've
never found a sample that worked that I was confident actually
matched what the hardware claimed to support.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Sat, 24 Mar 2012 22:34:43 +0000 (23:34 +0100)]
pthread: return proper error code on pthread_create failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 25 Mar 2012 09:48:09 +0000 (11:48 +0200)]
swr: fix segfault when 0 out size is used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 25 Mar 2012 08:59:22 +0000 (10:59 +0200)]
swr: revert stray hunk
Found-by:ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Fri, 23 Mar 2012 20:21:47 +0000 (21:21 +0100)]
VC1: Do not needlessly use signed types.
This might even have prevented the compiler from some optimizations,
since both signed and unsigned types are used for the dezigzag tables/
table pointers, and if a branches uses both the compiler needs to
create more complex code.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sat, 24 Mar 2012 16:13:55 +0000 (17:13 +0100)]
DV: detect another case of broken DV files.
See trac issue #217.
Only the dsf field seems to be used to distinguish between PAL and NTSC.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sat, 24 Mar 2012 22:39:30 +0000 (23:39 +0100)]
DV: check coded_width/height instead of width/height.
This makes the workaround also work with lowres.
Fixes issue #633.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Sat, 24 Mar 2012 22:01:37 +0000 (23:01 +0100)]
vqavideo: fix decoding of samples with no partial updates.
Fixes playback of
http://samples.mplayerhq.hu/game-formats/vqa/landsoflore/
B0EB8711.VQA
(trac issue #710).
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diego Biurrun [Fri, 16 Mar 2012 17:42:01 +0000 (18:42 +0100)]
x86: dsputil: prettyprint gcc inline asm
Diego Biurrun [Tue, 6 Mar 2012 12:00:42 +0000 (13:00 +0100)]
x86: K&R prettyprinting cosmetics for dsputil_mmx.c
Diego Biurrun [Sun, 18 Dec 2011 13:10:33 +0000 (14:10 +0100)]
x86: conditionally compile H.264 QPEL optimizations
Diego Biurrun [Thu, 8 Mar 2012 23:59:06 +0000 (00:59 +0100)]
dsputil_mmx: Surround QPEL macros by "do { } while (0);" blocks.
This makes them safe to use in non-fully braced if-blocks and similar.
Diego Biurrun [Fri, 23 Mar 2012 11:20:54 +0000 (12:20 +0100)]
Ignore generated files below doc/.
Michael Niedermayer [Sun, 25 Mar 2012 08:34:06 +0000 (10:34 +0200)]
resample: Fix boundary handling with fragments.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 25 Mar 2012 03:58:31 +0000 (05:58 +0200)]
swr: Fix partial flushing.
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 25 Mar 2012 03:37:26 +0000 (05:37 +0200)]
swr: test partial flushing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 25 Mar 2012 02:15:51 +0000 (04:15 +0200)]
mov: fix heap buffer overflow
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Mon, 19 Mar 2012 02:33:04 +0000 (19:33 -0700)]
dpcm: convert to bytestream2.
Michael Niedermayer [Sun, 25 Mar 2012 01:33:06 +0000 (03:33 +0200)]
swr: allow flushing in multiple steps if the output is too small.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 25 Mar 2012 00:56:53 +0000 (01:56 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avc: Add a function for converting mp4 style extradata to annex b
pthread: free progress if buffer allocation failed.
lavc/avconv: support changing frame sizes in codecs with frame mt.
libavformat: Document who sets the AVStream.id field
utvideo: mark output picture as keyframe.
sunrast: Add support for negative linesize.
vp8: fix update_lf_deltas in libavcodec/vp8.c
ralf: read Huffman code lengths without GetBitContext
Conflicts:
ffmpeg.c
libavcodec/sunrastenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sun, 25 Mar 2012 00:05:05 +0000 (17:05 -0700)]
interplayvideo: convert to bytestream2.
Michael Niedermayer [Sun, 25 Mar 2012 00:00:07 +0000 (01:00 +0100)]
ffmpeg: drop struct from SwrContext.
Its a typdef now and doesnt need the struct anymore.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Mar 2012 23:35:10 +0000 (00:35 +0100)]
swr: fix compilation failure with old versions of gcc.
gcc 4.4 did not like the way i used typedefs
Idea-by: beastd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Thu, 22 Mar 2012 11:31:31 +0000 (13:31 +0200)]
movenc: Merge if statements
This isn't exactly equivalent with the earlier code for codecs
other than H264 and VC1, but those are two only codecs supported
by this codepath anyway, and it simplifies it a bit.
Signed-off-by: Martin Storsjö <martin@martin.st>
Paul B Mahol [Sat, 24 Mar 2012 17:41:55 +0000 (17:41 +0000)]
libaacplus: switch to encode2()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alexander Strange [Sat, 24 Mar 2012 22:34:22 +0000 (15:34 -0700)]
h264: fix memleak in error path.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Alexander Strange [Sat, 24 Mar 2012 22:25:15 +0000 (18:25 -0400)]
pthread: Immediately release all frames in ff_thread_flush()
Before this, they were only added to the delayed release queue and not
freed until later. This could lead to unnecessary memory use or buffer
exhaustion.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Alexander Strange [Sat, 24 Mar 2012 21:32:14 +0000 (17:32 -0400)]
h264: Add check for invalid chroma_format_idc
Fixes a crash when FF_DEBUG_PICT_INFO is used.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Michael Niedermayer [Sat, 24 Mar 2012 22:20:46 +0000 (23:20 +0100)]
swr: drop SWR_CH_MAX with the next major ABI bump
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Fri, 23 Mar 2012 00:25:22 +0000 (17:25 -0700)]
utvideo: port header reading to bytestream2.
Fixes crash during slice size reading if slice_end goes negative.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Michael Niedermayer [Sat, 24 Mar 2012 22:00:59 +0000 (23:00 +0100)]
swr: dont use SWR_CH_MAX in the public function declaration.
This change should make no binary difference to the generated code.
the API version is just bumped for correctness sake, this is not
really a API or ABI change.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Mar 2012 21:56:24 +0000 (22:56 +0100)]
swr: make SwrContext a typedef.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Mar 2012 21:38:14 +0000 (22:38 +0100)]
swresample: support up to 32 channels
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Thu, 22 Mar 2012 11:25:58 +0000 (13:25 +0200)]
avc: Add a function for converting mp4 style extradata to annex b
Make movenc use this function instead of the current custom
conversion function.
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Sat, 24 Mar 2012 19:19:19 +0000 (20:19 +0100)]
pthread: free progress if buffer allocation failed.
Else we run out of progress variables after a few failed buffer
allocations.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Ronald S. Bultje [Fri, 23 Mar 2012 22:03:03 +0000 (15:03 -0700)]
lavc/avconv: support changing frame sizes in codecs with frame mt.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Martin Storsjö [Thu, 22 Mar 2012 15:05:08 +0000 (17:05 +0200)]
libavformat: Document who sets the AVStream.id field
Signed-off-by: Martin Storsjö <martin@martin.st>
Kostya Shishkov [Sat, 24 Mar 2012 18:54:31 +0000 (19:54 +0100)]
utvideo: mark output picture as keyframe.
Spotted by Антон.
Paul B Mahol [Sat, 24 Mar 2012 15:28:51 +0000 (15:28 +0000)]
adxenc: fix error in merging from qatar
Pointed out by FATE.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 24 Mar 2012 16:08:57 +0000 (16:08 +0000)]
sonic: mark as experimental
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Mar 2012 16:43:55 +0000 (17:43 +0100)]
indeo5dec: Make sure we have had a valid gop header.
This prevents decoding happening on a half initialized context.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Mar 2012 16:42:14 +0000 (17:42 +0100)]
truemotion2dec: Fix overread of input.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Mar 2012 15:29:46 +0000 (16:29 +0100)]
cavsdec: check stc in decode_slice_header()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Aneesh Dogra [Fri, 23 Mar 2012 17:54:00 +0000 (23:24 +0530)]
sunrast: Add support for negative linesize.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Michael Niedermayer [Sat, 24 Mar 2012 15:23:40 +0000 (16:23 +0100)]
h264: move resolution change check further up.
This prevents some variables from being changed in case of a
rejected resolution change.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Salonen [Mon, 19 Mar 2012 07:35:09 +0000 (09:35 +0200)]
vp8: fix update_lf_deltas in libavcodec/vp8.c
lf_delta.ref[i] and lf_delta.mode[i] were incorrectly reset to 0 if
specific delta value was not updated. Fixed to keep the previous value
if flag indicates that element in question is not updated.
Signed-off-by: Janne Salonen <jsalonen@google.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Michael Niedermayer [Sat, 24 Mar 2012 00:39:13 +0000 (01:39 +0100)]
alsdec: check opt_order.
Fixes out of array write in quant_cof
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Mar 2012 13:25:52 +0000 (14:25 +0100)]
mpegvideo: increase buffer sizes.
Fixes buffer overflow
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Mar 2012 11:29:05 +0000 (12:29 +0100)]
indeo4: Fix global array overread.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 24 Mar 2012 13:54:06 +0000 (14:54 +0100)]
Fix linking without yasm.
Kostya Shishkov [Sat, 24 Mar 2012 06:29:51 +0000 (07:29 +0100)]
ralf: read Huffman code lengths without GetBitContext
Those descriptions are stored in nibbles, so they are easy to extract.
And this way we don't need to pad tables for possible bit reader overreads.
Michael Niedermayer [Sat, 24 Mar 2012 09:59:43 +0000 (10:59 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rv34: error out on size changes with frame threading
aacsbr: Add a debug check to sbr_mapping.
aac: Reset some state variables when turning SBR off
aac: Reset PS parameters on header decode failure.
fate: add wmalossless test.
aacsbr: handle m_max values smaller than 4.
Conflicts:
libavcodec/aacsbr.c
tests/fate/lossless-audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 24 Mar 2012 00:32:26 +0000 (00:32 +0000)]
libopenjpegenc: switch to encode2()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 24 Mar 2012 00:12:16 +0000 (00:12 +0000)]
libopenjpeg: make .long_name usefull
Fixes following strange output:
DEV D libopenjpeg OpenJPEG based JPEG 2000 encoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 23 Mar 2012 23:03:55 +0000 (23:03 +0000)]
bintext: build decoders only if they are actually enabled
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Mar 2012 04:21:39 +0000 (05:21 +0100)]
vp56dec: avoid freeing the returned frame before returning it.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Mar 2012 01:40:24 +0000 (02:40 +0100)]
cavsdec: check for changing w/h.
Our decoder does not support changing w/h.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 24 Mar 2012 01:05:50 +0000 (02:05 +0100)]
indeo3: fix out of picture write.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 23 Mar 2012 23:20:05 +0000 (00:20 +0100)]
pthread/mpegvideo: detect and block attempts to init frames after setup.
This fixes race conditions that ultimately lead to memory corruption.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Fri, 23 Mar 2012 21:30:38 +0000 (22:30 +0100)]
rv34: error out on size changes with frame threading
Alex Converse [Wed, 21 Mar 2012 19:20:58 +0000 (12:20 -0700)]
aacsbr: Add a debug check to sbr_mapping.
There have been multiple bugs caused by inconsistencies here.
Based on an idea from Michael Niedermayer.
CC: libav-stable@libav.org
Alex Converse [Wed, 21 Mar 2012 19:00:56 +0000 (12:00 -0700)]
aac: Reset some state variables when turning SBR off
This makes sure the reset flag gets set when SBR gets turned back on
and sets control variables for unguided mode back to their defaults.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Alex Converse [Wed, 21 Mar 2012 17:11:02 +0000 (10:11 -0700)]
aac: Reset PS parameters on header decode failure.
If the next header frame codes zero envelopes the previous frame's
values will be used. Consequently the invalid values must be cleared.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Michael Niedermayer [Fri, 23 Mar 2012 20:56:42 +0000 (21:56 +0100)]
error_concealment: Prevent FPEs in case of corrupted input.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Thu, 22 Mar 2012 19:13:24 +0000 (12:13 -0700)]
fate: add wmalossless test.
Michael Niedermayer [Fri, 23 Mar 2012 20:20:06 +0000 (21:20 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rv34: Handle only complete frames in frame-mt.
MPV: set reference frame pointers to NULL when allocation of dummy pictures fails
configure: die if x11grab dependencies are unavailable
zerocodec: factorize loop
avconv: fix the resampling safety factors for output audio buffer allocation
avconv: move audio output buffer allocation to a separate function
avconv: make the async buffer global and free it in exit_program()
Conflicts:
ffmpeg.c
libavcodec/mpegvideo.c
libavcodec/rv34.c
libavcodec/zerocodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Thu, 22 Mar 2012 18:50:48 +0000 (11:50 -0700)]
aacsbr: handle m_max values smaller than 4.
Prevents a signflip in the counter, and a subsequent crash because of
overreads/overwrites.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Reimar Döffinger [Fri, 23 Mar 2012 15:01:01 +0000 (16:01 +0100)]
VC1: restore optimizations broken in
9a1ced32.
They were moved into code under HAVE_YASM and most of them
even into completely disabled code with no reason given
for that in the commit message.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Paul B Mahol [Fri, 23 Mar 2012 17:17:37 +0000 (17:17 +0000)]
interplayvideo: give avctx to av_dlog()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 23 Mar 2012 17:17:36 +0000 (17:17 +0000)]
interplayvideo: remove superfluous strings from av_log()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 23 Mar 2012 13:16:43 +0000 (13:16 +0000)]
vmdvideo: remove superfluous strings from av_log messages
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 23 Mar 2012 13:11:53 +0000 (13:11 +0000)]
sonic: fix warning about incompatible pointer types
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Fri, 16 Mar 2012 15:18:57 +0000 (16:18 +0100)]
rv34: Handle only complete frames in frame-mt.
Correct handling of errors to prevent hags or crashes is very complex
otherwise.
The frame initializing is also moved from decode_slice() to
decode_frame() for clarity.
Janne Grunau [Tue, 20 Mar 2012 13:44:28 +0000 (14:44 +0100)]
MPV: set reference frame pointers to NULL when allocation of dummy pictures fails
Josh Allmann [Wed, 21 Mar 2012 15:01:37 +0000 (08:01 -0700)]
configure: die if x11grab dependencies are unavailable
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Thu, 22 Mar 2012 19:50:58 +0000 (15:50 -0400)]
zerocodec: factorize loop
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Fri, 23 Mar 2012 11:10:08 +0000 (12:10 +0100)]
swr: check that there is enough information to do rematrixing when needed.
Fixes assertion failure.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 23 Mar 2012 10:38:20 +0000 (11:38 +0100)]
bitstream: build_table, check table_nb_bits.
Fixes null ptr deref.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 23 Mar 2012 10:03:53 +0000 (11:03 +0100)]
indeo4: check ref_mb
Fix NULL deref
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 23 Mar 2012 09:59:03 +0000 (10:59 +0100)]
ffmpeg: check samplerate from decoder.
Fixes FPE
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 23 Mar 2012 09:48:18 +0000 (10:48 +0100)]
rawdec: Check w/h.
Fixes FPE
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>