Commits · 79a98294da6cd85f8c86b34764c5e0c43b09eea3 · Linshizhi / ffmpeg.wasm-core

01 Jul, 2015 1 commit

avcodec/aacsbr: check that the element type matches before applying SBR · 79a98294

Michael Niedermayer authored Jul 01, 2015

Fixes out of array access
Fixes: signal_sigsegv_3670fc0_2818_cov_2307326154_moon.mux

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

79a98294

30 Jun, 2015 38 commits

ffmpeg: windows: respond to logoff and ctrl+break messages as well · 4ebb43f1
rogerdpack authored Jun 30, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
4ebb43f1

ffmpeg: only count got_output/errors in decode_error_stat · bd0f1412

Andreas Cadhalpun authored Jun 30, 2015

If threading is used, the first (thread_count - 1) packets are read
before any frame/error is returned. Counting this as successful decoding
is wrong, because it also happens when no single frame could be decoded.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

bd0f1412

ffmpeg: exit_on_error if decoding a packet failed · cd64ead8

Andreas Cadhalpun authored Jun 30, 2015

This is the second part of the fix for ticket #4370.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

cd64ead8

pthread_frame: forward error codes when flushing · 32a5b631

Andreas Cadhalpun authored Jun 30, 2015

This is the first part of the fix for ticket #4370.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

32a5b631

avcodec/h264: Greenmetadata SEI parsing · 04a68f43
Nicolas DEROUINEAU authored Jun 30, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
04a68f43

Merge commit '' · 7e9c7b62

Michael Niedermayer authored Jun 30, 2015

* commit '271ce76d':
  h264: Parse registered data SEI message and AFD value

Conflicts:
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_sei.c
	libavcodec/version.h

See: d6e95669
See: 22291c37Merged-by: Michael Niedermayer <michaelni@gmx.at>

7e9c7b62

Merge commit '' · 8e6c5c43

Michael Niedermayer authored Jun 30, 2015

* commit '0bfab80a':
  h264_sei: Group error check outside the switch block

Conflicts:
	libavcodec/h264_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

8e6c5c43

Merge commit '' · 2a227fe8

Michael Niedermayer authored Jun 30, 2015

* commit '0a49a62f':
  h263: Always check both dimensions

Conflicts:
	libavcodec/ituh263dec.c

See: 62006b53Merged-by: Michael Niedermayer <michaelni@gmx.at>

2a227fe8

Merge commit '' · 5585da7c

Michael Niedermayer authored Jun 30, 2015

* commit '6f4cd33e':
  cosmetic: Reformat ff_h263_decode_mba
Merged-by: Michael Niedermayer <michaelni@gmx.at>

5585da7c

Merge commit '' · cfcb9f5e

Michael Niedermayer authored Jun 30, 2015

* commit 'e95c7a61':
  mov: Preserve the metadata even when bit-exactness is requested

Conflicts:
	libavformat/movenc.c
	tests/ref/vsynth/vsynth1-mpeg4
	tests/ref/vsynth/vsynth2-mpeg4

See: a17ee411Merged-by: Michael Niedermayer <michaelni@gmx.at>

cfcb9f5e

Merge commit '' · 4ff0c61b

Michael Niedermayer authored Jun 30, 2015

* commit '303ec065':
  aic: Fix slice size computation for widths multiples of 32 macroblocks
Merged-by: Michael Niedermayer <michaelni@gmx.at>

4ff0c61b

Merge commit '' · 2e9dcb82

Michael Niedermayer authored Jun 30, 2015

* commit '3e3056f2':
  h264: Allow stream and container cropping at the same time

Conflicts:
	libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2e9dcb82

h264: Parse registered data SEI message and AFD value · 271ce76d

Vittorio Giovara authored Jun 28, 2015

Partially based on code by Marton Balint and Kieran Kunhya.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

271ce76d

h264_sei: Group error check outside the switch block · 0bfab80a
Vittorio Giovara authored Jun 28, 2015

0bfab80a
h263: Always check both dimensions · 0a49a62f
Luca Barbato authored Jun 26, 2015
```
CC: libav-stable@libav.org
Found-By: ago@gentoo.org
```
0a49a62f
cosmetic: Reformat ff_h263_decode_mba · 6f4cd33e
Luca Barbato authored Jun 26, 2015

6f4cd33e
mov: Preserve the metadata even when bit-exactness is requested · e95c7a61
Luca Barbato authored Jun 15, 2015
```
Make sure to not write the custom `encoder` string in that case.

Bug-Id: 845
CC: libav-stable@libav.org
```
e95c7a61
aic: Fix slice size computation for widths multiples of 32 macroblocks · 303ec065
Vittorio Giovara authored Jun 28, 2015
```
CC: libav-stable@libav.org
```
303ec065

h264: Allow stream and container cropping at the same time · 3e3056f2

Vittorio Giovara authored Mar 08, 2015

The container cropping is applied only when difference is within 16
pixels, and the smallest value between the two is chosen.

Bug-Id: 383
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

3e3056f2

fate: Update ac3 test to the new request_channel_layout option · 3ad678a8
Vittorio Giovara authored Jun 27, 2015

3ad678a8
mpegts: Add jpeg2000 stream type · 42bc768e
John Högberg authored Jun 29, 2015
```
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
42bc768e
avfilter/vf_ssim: fix some cosmetics issues · 185e7697
Paul B Mahol authored Jun 30, 2015
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
185e7697

Merge commit '' · a9aed08f

Michael Niedermayer authored Jun 30, 2015

* commit '3ad678a8':
  fate: Update ac3 test to the new request_channel_layout option
Merged-by: Michael Niedermayer <michaelni@gmx.at>

a9aed08f

avcodec/h264_slice: Use w/h from the AVFrame instead of mb_w/h · 330863c9

Michael Niedermayer authored Jun 30, 2015

Fixes out of array access
Fixes: asan_heap-oob_4d5bb0_682_cov_3124593265_Fraunhofer__a_driving_force_in_innovation__small.mp4

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

330863c9

avfilter/vf_transpose: Fix rounding error · 0083c166

Michael Niedermayer authored Jun 30, 2015

Fixes out of array access
Fixes: asan_heap-oob_7f875d_3482_cov_1818465256_ssudec.mov

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

0083c166

configure: Mention hap encoding for --enable-libsnappy. · 9295ee13
Carl Eugen Hoyos authored Jun 30, 2015

9295ee13
lavc/j2kenc: Make jp2 output compatible with Kakadu. · 0f5b9965
Carl Eugen Hoyos authored Jun 30, 2015
```
Fixes ticket #4689.
```
0f5b9965
doc: Add jpeg2000 encoder documentation. · e97ec656
Carl Eugen Hoyos authored Jun 30, 2015

e97ec656
lavc/hapenc: Silence a warning for multithreaded encoding. · 8080688d
Carl Eugen Hoyos authored Jun 30, 2015

8080688d
avcodec/j2kenc: store libavcodec ident in a comment unless bitexact mode is used · 5c047f3a
Michael Niedermayer authored Jun 30, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
5c047f3a

vp9/update_prob: prevent out of bounds table read · e91f860e

James Zern authored Jun 30, 2015

the max value of the lookup in expanded form is:
(((1 << 7) - 1) << 1) - 65 + 1 + 64 = 254

add one entry of padding to inv_map_table[] to prevent out of bounds
access with non-conforming / fuzzed bitstreams
Signed-off-by: James Zern <jzern@google.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

e91f860e

Merge commit '' · 088b410e

Michael Niedermayer authored Jun 30, 2015

* commit '42bc768e':
  mpegts: Add jpeg2000 stream type

Conflicts:
	libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

088b410e

Merge commit '' · 6d9dfb12

Michael Niedermayer authored Jun 30, 2015

* commit '1b4c4684':
  riff: Validate the wav header size before trying to parse it

Conflicts:
	libavformat/riffdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

6d9dfb12

Merge commit '' · 3cd6b6aa

Michael Niedermayer authored Jun 30, 2015

* commit '5bdfc171':
  asf: Do not skip data streams
Merged-by: Michael Niedermayer <michaelni@gmx.at>

3cd6b6aa

Rename asfdec-o.c to asfdec_o.c · 0d5a27c2

Michael Niedermayer authored Jun 30, 2015

Most files use _ instead of - as spacer, so this is more consistent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

0d5a27c2

avformat: rename asfdec.c to asfdec_f.c · 8f9c39b3
Michael Niedermayer authored Jun 30, 2015
```
leaving it as asfdec.c confuses git
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
8f9c39b3
configure: fix hevc_vdpau_hwaccel dependencies · 6415dcb0
James Almer authored Jun 30, 2015
```
Signed-off-by: James Almer <jamrial@gmail.com>
```
6415dcb0

avcodec/h264_refs: discard mismatching references · 4aa0de64

Michael Niedermayer authored Jun 30, 2015

Fixes inconsistency and out of array access
Fixes: asan_heap-oob_17301a3_2100_cov_3226131691_ff_add_pixels_clamped_mmx.m2ts

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

4aa0de64

29 Jun, 2015 1 commit

avcodec/mjpegdec: Fix small picture upscale · 84afc6b7

Michael Niedermayer authored Jun 29, 2015

Fixes out of array access

Fixes: asan_heap-oob_1dd60fd_267_cov_2954683513_5baad44ca4702949724234e35c5bb341.jpg

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

84afc6b7