Commits · 0b27136c65c1b4fab29b5b354e1f470f974bc310 · Linshizhi / ffmpeg.wasm-core

14 Apr, 2012 16 commits

matroskadec: fix null pointer dereference · 0b27136c
Michael Niedermayer authored Apr 14, 2012
```
Fixes: Ticket1206
Found-by: John Villamil
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
0b27136c
wtvdec: fix name_size check to consider integer overflows. · c42efad3
Michael Niedermayer authored Apr 14, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
c42efad3

lagarith: check count before writing zeros. · 83c7803f

Michael Niedermayer authored Apr 14, 2012

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

83c7803f

Clear residues only in not coded channel. This fixes overwriting coded... · 56dcfe87

Jakub Stachowski authored Apr 14, 2012

Clear residues only in not coded channel. This fixes overwriting coded residues with zeros if first channel is coded and second is not.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

56dcfe87

latmenc: replace per-frame malloc/free by constant size buffer. · b44a5ec7
Reimar Döffinger authored Apr 11, 2012
```
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
```
b44a5ec7

avidec: handle 0-size packets that exist only in index. · d05625bd

Reimar Döffinger authored Apr 13, 2012

0-sized packets are used to implement variable fps.
However there seems to be a variation where these are not
even stored in the main file but as 0-size index entries
only.
This fixes the sample in trac issue #957, it now plays both
the same ways as in MPlayer and in a way that looks correct.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

d05625bd

mp3enc: clarify meaning of "Unsupported" messages. · 4c53c66a

Reimar Döffinger authored Apr 13, 2012

They will only cause us to skip writing the Xing header,
not cause any serious breakage.
Related to trac issue #1027.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

4c53c66a

wmalosslessdec: Reset put bit buffer when num_saved_bits is reset. · 64bd7f8e
Michael Niedermayer authored Apr 14, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
64bd7f8e
wmalosslessdec: Fix reading too many bits in decode_channel_residues() · b3a43515
Michael Niedermayer authored Apr 14, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
b3a43515
wmalosslessdec: fix a get_bits(0) in decode_ac_filter · 2a7063de
Michael Niedermayer authored Apr 14, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
2a7063de
wmalosslessdec: make mclms arrays big enough for whats written into them. · a0abefb0
Michael Niedermayer authored Apr 14, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
a0abefb0

wmalosslessdec: Make arrays WMALL_BLOCK_MAX_SIZE big and check samples_per_frame. · d442c446

Michael Niedermayer authored Apr 14, 2012

The samples_per_frame check is ported from wmaprodec.c

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

d442c446

wmaprodec: check min_samples_per_subframe · 9166f483

Michael Niedermayer authored Apr 14, 2012

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

9166f483

wmaprodec; fix get_bits(0) case. · b28c678b

Michael Niedermayer authored Apr 14, 2012

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

b28c678b

wmaprodec: check num_vec_coeffs for validity · 97a5addf

Michael Niedermayer authored Apr 14, 2012

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

97a5addf

lavf: print with debug level the byte positions before and after find_stream_info · 52ec2695
Michael Niedermayer authored Apr 14, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
52ec2695

13 Apr, 2012 24 commits

mp3on4: allocate a large enough frame. · cca95285

Michael Niedermayer authored Apr 13, 2012

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

cca95285

avidec: update size when packet is shrunk · c41ac870

Michael Niedermayer authored Apr 13, 2012

Fixes out of array read

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

c41ac870

lavfi/drawbox: fix width displayed in place of x. · 3f80546d
Clément Bœsch authored Apr 13, 2012

3f80546d

dfa: Fix out of array write in decode_dds1() · 72b9537d

Michael Niedermayer authored Apr 13, 2012

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

72b9537d

dfa: fix out of array write in decode_wdlt() · d1c95d2c

Michael Niedermayer authored Apr 13, 2012

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

d1c95d2c

Merge remote-tracking branch 'qatar/master' · 367d9b29

Michael Niedermayer authored Apr 13, 2012

* qatar/master:
  swscale: K&R formatting cosmetics (part II)
  tiffdec: Add a malloc check and refactor another.
  faxcompr: Check malloc results and unify return path
  configure: escape colons in values written to config.fate
  ac3dsp: call femms/emms at the end of float_to_fixed24() for 3DNow and SSE
  matroska: Fix leaking memory allocated for laces.
  pthread: Fix crash due to fctx->delaying not being cleared.
  vp3: Assert on invalid filter_limit values.
  h264: fix 10bit biweight functions after recent x86inc.asm fixes.
  ffv1: Fix size mismatch in encode_line.
  movenc: Remove a dead initialization
  git-howto: Explain how to avoid Windows line endings in git checkouts.
  build: Move all arch OBJS declarations into arch subdirectory Makefiles.

Conflicts:
	configure
	libavcodec/vp3.c
	libavformat/matroskadec.c
	libavutil/Makefile
	libswscale/Makefile
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

367d9b29

swscale: K&R formatting cosmetics (part II) · ef0ee7f6
Diego Biurrun authored Apr 01, 2012
```
Also adjust some comments including wording and typo fixes.
```
ef0ee7f6
tiffdec: Add a malloc check and refactor another. · 90a43060
Alex Converse authored Apr 13, 2012

90a43060
faxcompr: Check malloc results and unify return path · 99a33529
Alex Converse authored Apr 13, 2012

99a33529

av_image_alloc: Align the width to 8 when align >= 8. · 62e5ef95

Michael Niedermayer authored Apr 12, 2012

This allows simd optimized routines to work in steps of 8 pixels
without going over the linesize. (this matters for yuv->rgb24 for example)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

62e5ef95

cmdutils: fix "oswr may be used uninitialized" warning · 41a052a6
Michael Niedermayer authored Apr 13, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
41a052a6
avpicture_layout: use a endian independant format for the palette. · 2ec8789e
Michael Niedermayer authored Apr 13, 2012
```
This should fix the failing fate PAL8 tests.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
2ec8789e

configure: escape colons in values written to config.fate · 6555acad

Mans Rullgard authored Apr 12, 2012

The fields in config.fate are colon-separated so any colons
within the fields should be escaped to prevent confusion.
Signed-off-by: Mans Rullgard <mans@mansr.com>

6555acad

mov: zero sc->pb in mov_read_close() · 84d74610

Michael Niedermayer authored Apr 13, 2012

Its bad to free things without zeroing them.
This fixes a potential issue when mov_read_close() would be called twice.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

84d74610

mov: Fix memory leaks on aborted header parsing. · a6b3e6d0

Dale Curtis authored Apr 13, 2012

If mov_read_header exits under error, the memory allocated is
not freed.
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

a6b3e6d0

mov: zero extradata_size on deallocation of extradata. · ab3fcd93

Michael Niedermayer authored Apr 13, 2012

This prevents the possibility of extradata and its size becoming desynced.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ab3fcd93

matroska: Fix leaking memory allocated for laces. · b5ada68e

Dale Curtis authored Apr 13, 2012

During error conditions matroska_parse_block may exit without
freeing the memory allocated for laces.

Found via valgrind: http://pastebin.com/E54k8QFUSigned-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

b5ada68e

mov: Fix harmless OOB read. · fd165a0b

Dale Curtis authored Apr 13, 2012

Convert key_off initialize to use the same sc->keyframe_count as
used elsewhere in the function.
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

fd165a0b

pthread: Fix crash due to fctx->delaying not being cleared. · a9d114dc

Dale Curtis authored Apr 13, 2012

corrects invalid return when avpkt->size == 0.

Reproducible with test case and ffplay -threads 2. Stack trace:
http://pastebin.com/PexZ4Uc0

Test case:
http://commondatastorage.googleapis.com/dalecurtis-shared/crash.ogmSigned-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

a9d114dc

ac3dsp: call femms/emms at the end of float_to_fixed24() for 3DNow and SSE · de7f22ab
Justin Ruggles authored Apr 12, 2012
```
Fixes ac3-encode and eac3-encode FATE test failures with SSE2 disabled.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
```
de7f22ab

matroska: Fix leaking memory allocated for laces. · 31168588

Dale Curtis authored Apr 13, 2012

During error conditions matroska_parse_block may exit without
freeing the memory allocated for laces.

Found via valgrind: http://pastebin.com/E54k8QFUSigned-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

31168588

pthread: Fix crash due to fctx->delaying not being cleared. · 97ae3700

Dale Curtis authored Apr 13, 2012

Reproducible with test case and ffplay -threads 2. Stack trace:
http://pastebin.com/PexZ4Uc0

Test case:
http://commondatastorage.googleapis.com/dalecurtis-shared/crash.ogmSigned-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

97ae3700

vp3: Assert on invalid filter_limit values. · 27c2fb0f

Dale Curtis authored Apr 12, 2012

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

27c2fb0f

h264: fix 10bit biweight functions after recent x86inc.asm fixes. · 76538d7a
Ronald S. Bultje authored Apr 12, 2012
```
This should have been updated in the x86inc.asm update, but was
accidently forgotten.
```
76538d7a