71c2a70cbf
error_concealment: Prevent FPEs in case of corrupted input.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
e2d110d8d2
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>
14 years ago
adb98a3d22
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>
14 years ago
e730036fdc
interplayvideo: give avctx to av_dlog()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
0c57f8197c
interplayvideo: remove superfluous strings from av_log()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
a0b07b8fc5
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>
14 years ago
89cd95b19c
sonic: fix warning about incompatible pointer types
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
73ad4471a4
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.
14 years ago
5ab506a5c8
MPV: set reference frame pointers to NULL when allocation of dummy pictures fails
14 years ago
4a584edad7
configure: die if x11grab dependencies are unavailable
Signed-off-by: Diego Biurrun <diego@biurrun.de>
14 years ago
afa6129016
zerocodec: factorize loop
Signed-off-by: Diego Biurrun <diego@biurrun.de>
14 years ago
ae03b2141e
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>
14 years ago
2e909b3c77
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>
14 years ago
aae44fb4cd
indeo4: check ref_mb
Fix NULL deref
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
1664edb998
ffmpeg: check samplerate from decoder.
Fixes FPE
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
a22e64fd02
rawdec: Check w/h.
Fixes FPE
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
5934d57ba9
xmv: check channel number
Fixes FPE
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
08c37a10e9
mjpegdec: check h/v_count.
Fixes FPE
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
46c7842994
ituh263dec: Implement enough of Annex O (scalability) to fix a FPE.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
4094fc9971
avconv: fix the resampling safety factors for output audio buffer allocation
This matches the output size required for audio_resample()
14 years ago
9869e963a6
avconv: move audio output buffer allocation to a separate function
Allows for removing a goto and makes the code easier to follow.
14 years ago
f3ab3e1aee
avconv: make the async buffer global and free it in exit_program()
14 years ago
cc415956a4
error_conceal: fix FPE in guess_dc() with huge sizes.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
ac2cb27916
mov: Fix FPE on 0 time_scale
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
c0a99eae29
indeo4: check band->scan
Fixes null ptr exception
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
f927c5b753
vorbisdemux: Check private context in theoras gtopts.
This prevents a null ptr dereference.
It could be checked differently but this way it should
be possible to return some data.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
ae2c33b0c2
cosmetics: remove superfluous curly brackets
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
0e465c1a81
huffyuv: remove long time disabled code
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
3a085c6a37
huffyuv: do not decode/encode yuv colorspace with odd width
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
ba02069a8e
aacdec: prevent channels from exceeding MAX_CHANNELS.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
01fd1aa0ad
matroskadec: fix strcmp(NULL)
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
437f5daf0b
mov: fix global unicode convertion array overflow.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
0c97fd336e
mmdemux: dont set pkt->size to an invalid value.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
7c0748c2db
eatqi: replace break by goto.
This fixes some heap overread.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
5a4af049b1
aacdec: reset max_sfb on invalid data.
Fixes global out of array read.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
3583c8706d
vqavideodev: Check image dimensions
Fixes out of heap array read
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
464cef4c14
Merge remote-tracking branch 'qatar/master'
* qatar/master:
xwma: Validate channels and bits_per_coded_sample.
mov: Do not read past the end of the ctts_data table.
mov: Add missing terminator to mov_ch_layout_map_1ch.
asf: reset side data elements on packet copy.
wmavoice: fix stack overread.
wmalossless: error out if a subframe is not used by any channel.
vqa: check palette chunk size before reading data.
wmalossless: reset sample pointer for each subframe.
wmalossless: error out on invalid values for order.
Conflicts:
libavcodec/vqavideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
9759d2b886
indeo4: check motion vetors.
Fixes out of heap array read.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
afc0cc22e1
pngenc: make max_packet_size 64bit check check it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
50a3867bab
png: make ff_png_pass_mask local to pngdec.
14 years ago
abdcb4918c
Fix libgsm.c compilation after typo in 67b8c8.
14 years ago
5023b89bba
xwma: Validate channels and bits_per_coded_sample.
This prevents a SIGFPE later on.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
14 years ago
86f2ae06b9
mov: Do not read past the end of the ctts_data table.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
14 years ago
3e6e89b3d6
mov: Add missing terminator to mov_ch_layout_map_1ch.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: Libav-stable@libav.org
14 years ago
6716e6892b
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: Add ZeroCodec test
oggparseogm: fix order of arguments of avpriv_set_pts_info().
pngenc: better upper bound for encoded frame size.
aiffdec: set block_duration to 1 for PCM codecs that are supported in AIFF-C
aiffdec: factor out handling of integer PCM for AIFF-C and plain AIFF
aiffdec: use av_get_audio_frame_duration() to set block_duration for AIFF-C
aiffdec: do not set bit rate if block duration is unknown
wmall: output packet only if we have decoded some samples
Conflicts:
libavcodec/pngenc.c
tests/fate/lossless-video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
b1a0d694ea
dcaenc: switch to encode2()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
ffa28da180
Support dropping audio dts/pts via -async -1.
Allows working around issue #605 .
Note: as a side effect this fixes that -vsync drop
as far as I could tell would not drop pts/dts values
when duplicating frames or when flushing encoder delay.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
14 years ago
e73c6aaabf
asf: reset side data elements on packet copy.
Prevents crash (double free) when free()ing the original packet.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
14 years ago
262196445c
wmavoice: fix stack overread.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
14 years ago
3c9267673e
wmalossless: error out if a subframe is not used by any channel.
Prevents infinite loop because min_channel_len never increments.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
14 years ago
Michael Niedermayer
Reimar Döffinger
Paul B Mahol
Janne Grunau
Josh Allmann
Justin Ruggles
Clément Bœsch
Carl Eugen Hoyos
Alex Converse
Ronald S. Bultje