Commits · 5cddfc58d882192d98da1520fdafc4869a3e8099 · Linshizhi / ffmpeg.wasm-core

24 Mar, 2012 8 commits

Fix linking without yasm. · 5cddfc58
Carl Eugen Hoyos authored Mar 24, 2012

5cddfc58

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

Michael Niedermayer authored Mar 24, 2012

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

f58f75dd

libopenjpegenc: switch to encode2() · b222c28e

Paul B Mahol authored Mar 24, 2012

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

b222c28e

libopenjpeg: make .long_name usefull · a5b82336

Paul B Mahol authored Mar 24, 2012

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>

a5b82336

bintext: build decoders only if they are actually enabled · 68a257e6

Paul B Mahol authored Mar 23, 2012

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

68a257e6

vp56dec: avoid freeing the returned frame before returning it. · d85b3c4f
Michael Niedermayer authored Mar 24, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
d85b3c4f

cavsdec: check for changing w/h. · 25715064

Michael Niedermayer authored Mar 24, 2012

Our decoder does not support changing w/h.

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

25715064

indeo3: fix out of picture write. · ba775a54

Michael Niedermayer authored Mar 24, 2012

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

ba775a54

23 Mar, 2012 32 commits

pthread/mpegvideo: detect and block attempts to init frames after setup. · 59a4b735

Michael Niedermayer authored Mar 23, 2012

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>

59a4b735

rv34: error out on size changes with frame threading · cb7190cd
Janne Grunau authored Mar 23, 2012

cb7190cd

aacsbr: Add a debug check to sbr_mapping. · b00307ec

Alex Converse authored Mar 21, 2012

There have been multiple bugs caused by inconsistencies here.

Based on an idea from Michael Niedermayer.

CC: libav-stable@libav.org

b00307ec

aac: Reset some state variables when turning SBR off · 0cb93dac

Alex Converse authored Mar 21, 2012

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

0cb93dac

aac: Reset PS parameters on header decode failure. · a237b380

Alex Converse authored Mar 21, 2012

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

a237b380

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
fate: add wmalossless test. · 7beec7e2
Ronald S. Bultje authored Mar 22, 2012

7beec7e2

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

aacsbr: handle m_max values smaller than 4. · 71ea2681

Ronald S. Bultje authored Mar 22, 2012

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

71ea2681

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