Commits · 71c2a70cbfbb5fea6dffa5e462b0227565e29bcc · Linshizhi / ffmpeg.wasm-core

23 Mar, 2012 32 commits

error_concealment: Prevent FPEs in case of corrupted input. · 71c2a70c
Michael Niedermayer authored Mar 23, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
71c2a70c

Merge remote-tracking branch 'qatar/master' · e2d110d8

Michael Niedermayer authored Mar 23, 2012

* 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>

e2d110d8

VC1: restore optimizations broken in . · adb98a3d

Reimar Döffinger authored Mar 23, 2012

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>

adb98a3d

interplayvideo: give avctx to av_dlog() · e730036f

Paul B Mahol authored Mar 23, 2012

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

e730036f

interplayvideo: remove superfluous strings from av_log() · 0c57f819
Paul B Mahol authored Mar 23, 2012
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
0c57f819

vmdvideo: remove superfluous strings from av_log messages · a0b07b8f

Paul B Mahol authored Mar 23, 2012

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>

a0b07b8f

sonic: fix warning about incompatible pointer types · 89cd95b1

Paul B Mahol authored Mar 23, 2012

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

89cd95b1

rv34: Handle only complete frames in frame-mt. · 73ad4471

Janne Grunau authored Mar 16, 2012

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.

73ad4471

MPV: set reference frame pointers to NULL when allocation of dummy pictures fails · 5ab506a5
Janne Grunau authored Mar 20, 2012

5ab506a5
configure: die if x11grab dependencies are unavailable · 4a584eda
Josh Allmann authored Mar 21, 2012
```
Signed-off-by: Diego Biurrun <diego@biurrun.de>
```
4a584eda
zerocodec: factorize loop · afa61290
Michael Niedermayer authored Mar 22, 2012
```
Signed-off-by: Diego Biurrun <diego@biurrun.de>
```
afa61290

swr: check that there is enough information to do rematrixing when needed. · ae03b214

Michael Niedermayer authored Mar 23, 2012

Fixes assertion failure.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ae03b214

bitstream: build_table, check table_nb_bits. · 2e909b3c

Michael Niedermayer authored Mar 23, 2012

Fixes null ptr deref.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

2e909b3c

indeo4: check ref_mb · aae44fb4

Michael Niedermayer authored Mar 23, 2012

Fix NULL deref

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

aae44fb4

ffmpeg: check samplerate from decoder. · 1664edb9

Michael Niedermayer authored Mar 23, 2012

Fixes FPE

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

1664edb9

rawdec: Check w/h. · a22e64fd

Michael Niedermayer authored Mar 23, 2012

Fixes FPE

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

a22e64fd

xmv: check channel number · 5934d57b

Michael Niedermayer authored Mar 23, 2012

Fixes FPE

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

5934d57b

mjpegdec: check h/v_count. · 08c37a10

Michael Niedermayer authored Mar 23, 2012

Fixes FPE

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

08c37a10

ituh263dec: Implement enough of Annex O (scalability) to fix a FPE. · 46c78429
Michael Niedermayer authored Mar 23, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
46c78429
avconv: fix the resampling safety factors for output audio buffer allocation · 4094fc99
Justin Ruggles authored Mar 21, 2012
```
This matches the output size required for audio_resample()
```
4094fc99
avconv: move audio output buffer allocation to a separate function · 9869e963
Justin Ruggles authored Mar 21, 2012
```
Allows for removing a goto and makes the code easier to follow.
```
9869e963
avconv: make the async buffer global and free it in exit_program() · f3ab3e1a
Justin Ruggles authored Mar 21, 2012

f3ab3e1a
error_conceal: fix FPE in guess_dc() with huge sizes. · cc415956
Michael Niedermayer authored Mar 23, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
cc415956

mov: Fix FPE on 0 time_scale · ac2cb279

Michael Niedermayer authored Mar 23, 2012

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ac2cb279

indeo4: check band->scan · c0a99eae

Michael Niedermayer authored Mar 23, 2012

Fixes null ptr exception

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

c0a99eae

vorbisdemux: Check private context in theoras gtopts. · f927c5b7

Michael Niedermayer authored Mar 23, 2012

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>

f927c5b7

cosmetics: remove superfluous curly brackets · ae2c33b0

Paul B Mahol authored Mar 22, 2012

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ae2c33b0

huffyuv: remove long time disabled code · 0e465c1a

Paul B Mahol authored Mar 23, 2012

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

0e465c1a

huffyuv: do not decode/encode yuv colorspace with odd width · 3a085c6a
Paul B Mahol authored Mar 23, 2012
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
3a085c6a
aacdec: prevent channels from exceeding MAX_CHANNELS. · ba02069a
Michael Niedermayer authored Mar 23, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ba02069a

matroskadec: fix strcmp(NULL) · 01fd1aa0

Michael Niedermayer authored Mar 23, 2012

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

01fd1aa0

mov: fix global unicode convertion array overflow. · 437f5daf

Michael Niedermayer authored Mar 23, 2012

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

437f5daf

22 Mar, 2012 8 commits

mmdemux: dont set pkt->size to an invalid value. · 0c97fd33

Michael Niedermayer authored Mar 22, 2012

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

0c97fd33

eatqi: replace break by goto. · 7c0748c2

Michael Niedermayer authored Mar 22, 2012

This fixes some heap overread.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

7c0748c2

aacdec: reset max_sfb on invalid data. · 5a4af049

Michael Niedermayer authored Mar 22, 2012

Fixes global out of array read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

5a4af049

vqavideodev: Check image dimensions · 3583c870

Michael Niedermayer authored Mar 22, 2012

Fixes out of heap array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

3583c870

Merge remote-tracking branch 'qatar/master' · 464cef4c

Michael Niedermayer authored Mar 22, 2012

* 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>

464cef4c

indeo4: check motion vetors. · 9759d2b8

Michael Niedermayer authored Mar 22, 2012

Fixes out of heap array read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

9759d2b8

pngenc: make max_packet_size 64bit check check it. · afc0cc22
Michael Niedermayer authored Mar 22, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
afc0cc22
png: make ff_png_pass_mask local to pngdec. · 50a3867b
Clément Bœsch authored Mar 22, 2012

50a3867b