Commits · 96e1cc3f8b6b0b5b19820609b23642bde1ee7e7c · Linshizhi / ffmpeg.wasm-core

13 Jul, 2015 40 commits

Michael Niedermayer authored Jul 13, 2015

* commit 'a5a6a786':
  mp3: Forward seeking errors

Conflicts:
	libavformat/mp3dec.c

No change as the avio_seek() that are part of seeking in mp3 are already
checked in FFmpeg
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

96e1cc3f

Merge commit '' · 3edc6d1c

Michael Niedermayer authored Jul 13, 2015

* commit '32c8d89c':
  hevc: Print the non-supported chroma_format_idc

Conflicts:
	libavcodec/hevc_ps.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

3edc6d1c

Merge commit '' · e17a459a

Michael Niedermayer authored Jul 13, 2015

* commit '8e373fe0':
  hevc: Factor out the pixel format mapping from the sps parser

Conflicts:
	libavcodec/hevc_ps.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

e17a459a

Merge commit '' · db1ab7e5

Michael Niedermayer authored Jul 13, 2015

* commit 'c571424c':
  asfdec: prevent memory leaks found with Coverity Scan
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

db1ab7e5

avcodec/mpegvideo: Fix null pointer dereference of picture array · 4bde1a4a

Michael Niedermayer authored Jul 13, 2015

Fixes: 0d0a2bace067d09c08f0fa5340496c23_signal_sigsegv_7ffff713351a_342_WobblyWindowsIntro.avi with memlimit of 67108864

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

4bde1a4a

ffmpeg: Fix cleanup with ost = NULL · 503ec713

Michael Niedermayer authored Jul 13, 2015

Fixes: 09e670595acbdafb226974b08dab66e3_signal_sigabrt_7ffff70eccc9_991_xtrem_e2_m64q15_a32sxx.3gp with memlimit of 1048576

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

503ec713

avcodec/hevc_parser: Fix memleaks in parser mix · 85b7456e
Michael Niedermayer authored Jul 13, 2015
```
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
85b7456e

avformat/oggdec: Check buf before copying data in to it · 32d023eb

Michael Niedermayer authored Jul 13, 2015

Fixes null pointer dereference
Fixes: aace024653cc62947336b86f8de812ab_signal_sigsegv_a0500f_343_WobblyWindowsIntro.ogg with memlimit 262144

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

32d023eb

avcodec/pthread_frame: check avctx on deallocation · 5d346fea

Michael Niedermayer authored Jul 13, 2015

Fixes null pointer dereferences
Fixes: af1a5a33e67e479f439239097bd0d4fd_signal_sigsegv_7ffff713351a_152_Dolby_Rain_Logo.pmp with memlimit of 8388608

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

5d346fea

mp3: Forward seeking errors · a5a6a786
Luca Barbato authored Jul 12, 2015
```
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
a5a6a786
hevc: Print the non-supported chroma_format_idc · 32c8d89c
Luca Barbato authored Jul 12, 2015
```
And drop the spurious newline.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
32c8d89c
hevc: Factor out the pixel format mapping from the sps parser · 8e373fe0
Luca Barbato authored Jul 12, 2015
```
The function will grow larger as more formats are supported.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
8e373fe0
asfdec: prevent memory leaks found with Coverity Scan · c571424c
Alexandra Hájková authored Jul 13, 2015
```
Signed-off-by: Anton Khirnov <anton@khirnov.net>
```
c571424c

avcodec/hevc_parser: use the old parser only when hevc decoder is available · 84e847c7

James Almer authored Jul 13, 2015

If it's not, then the new dependence-free parser will be used instead
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

84e847c7

avutil/frame: fix crash with av_frame_unref(NULL) · feb6a94f

Michael Niedermayer authored Jul 13, 2015

Fixes: af94b3a3d26586c08f557cafe8246251_signal_sigsegv_7ffff713351a_343_XFMode.ASF with 2097152 alloc limit

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

feb6a94f

avcodec/mpegvideo: Check for NULL in ff_mpv_common_end() · cc038022

Michael Niedermayer authored Jul 13, 2015

Fixes: af94b3a3d26586c08f557cafe8246251_signal_sigsegv_7ffff713351a_343_XFMode.ASF with 1048576 alloc limit

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

cc038022

avcodec/vp3: check current_frame before accessing it · 69716036

Michael Niedermayer authored Jul 13, 2015

Fixes null pointer dereference
Fixes: b15eb06e0111e94bc59123c86db7aff9_signal_sigsegv_a0500f_45_320vp3.nsv with allocation limit 536870912

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

69716036

configure: Fix build with --disable-decoders --enable-parser=hevc · ba051661
Michael Niedermayer authored Jul 13, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
ba051661

Merge commit '' · da10aaf2

Michael Niedermayer authored Jul 13, 2015

* commit '1b9a8e5f':
  dxva2_hevc: unbreak compilation after recent sps/pps changes

See: 1aab5d8aMerged-by: Michael Niedermayer <michael@niedermayer.cc>

da10aaf2

Merge commit '' · 5be07d02

Michael Niedermayer authored Jul 13, 2015

* commit 'a062a55d':
  hevc_parser: fix standalone build with the hevc decoder disabled

Conflicts:
	libavcodec/Makefile
	libavcodec/hevc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

5be07d02

Merge commit '' · 1127b35f

Michael Niedermayer authored Jul 13, 2015

* commit 'b9f76d19':
  hevc_ps: make sure failing to decode an SPS always returns an error

Conflicts:
	libavcodec/hevc_ps.c

See: 15893adbMerged-by: Michael Niedermayer <michael@niedermayer.cc>

1127b35f

Merge commit '' · afa97144

Michael Niedermayer authored Jul 13, 2015

* commit '077b5594':
  hevc: handle a NULL sps in set_sps() properly
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

afa97144

Merge commit '' · d13fc982

Michael Niedermayer authored Jul 13, 2015

* commit '18156b53':
  hevc: do not pass an entire HEVCContext into export_stream_params()
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

d13fc982

avcodec/sanm: Reset sizes in destroy_buffers() · 39bbdebb

Michael Niedermayer authored Jul 13, 2015

Fixes crash in 1288a2fe8e9ae6b00ca40e089d08ca65_signal_sigsegv_7ffff71426a7_354_accident.san with allocation limit 65536

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

39bbdebb

avcodec/alac: Clear pointers in allocate_buffers() · f7068bf2

Michael Niedermayer authored Jul 13, 2015

Fixes: 06a4edb39ad8a9883175f9bd428334a2_signal_sigsegv_7ffff713351a_706_mov__alac__ALAC_6ch.mov

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

f7068bf2

avformat/utils: Skip ff_configure_buffers_for_index() for local files · b5136612

Michael Niedermayer authored Jul 13, 2015

Theres no known case where its use on local files improves performance
if you know of such a case, please contact us
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

b5136612

configure: clean whitespace with [:space:] · f5c281da

Zhang Rui authored Jul 13, 2015

https://en.wikibooks.org/wiki/Regular_Expressions/POSIX_Basic_Regular_Expressions

Fixes NDKr10e on Cygwin,
CC_IDENT for it is defined as
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

f5c281da

avformat/mov: Use ff_configure_buffers_for_index() · 488cc051
Michael Niedermayer authored Jun 02, 2015
```
Fixes Ticket2513
Fixes Ticket4432
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
488cc051

avformat: Add ff_configure_buffers_for_index() · b183fb47

Michael Niedermayer authored Jun 02, 2015

This allows configuring the io buffer in such way that few seeks are needed for playback
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

b183fb47

dxva2_hevc: unbreak compilation after recent sps/pps changes · 1b9a8e5f
James Almer authored Jul 13, 2015
```
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
```
1b9a8e5f
hevc_parser: fix standalone build with the hevc decoder disabled · a062a55d
Anton Khirnov authored Jul 13, 2015
```
The parser depends on hevc_ps, which in turn needs some data tables.
Found-by: James Almer <jamrial@gmail.com>
```
a062a55d

hevc_ps: make sure failing to decode an SPS always returns an error · b9f76d19

Anton Khirnov authored Jul 13, 2015

Some of the goto err clauses do not set the error code. It seems better
to fall back on INVALIDDATA instead of adding it everywhere explicitly.

b9f76d19

avcodec/dxva2_hevc: unbreak compilation after recent sps/pps changes · 1aab5d8a
James Almer authored Jul 13, 2015
```
Signed-off-by: James Almer <jamrial@gmail.com>
```
1aab5d8a
avcodec/vdpau_hevc: unbreak compilation after sps/pps changes · b11c3fce
Philip Langdale authored Jul 13, 2015
```
There was some reorganisation in the HEVC headers so the sps and pps
now live in a different place.
```
b11c3fce
avcodec/utils: Check that the sample rate is not negative when opening an encoder · 10d7d088
Michael Niedermayer authored Jul 13, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
10d7d088
tests/checkasm/x86/Makefile: Use ASMSTRIPFLAGS for asm · 7c944b0a
Michael Niedermayer authored Jul 13, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
7c944b0a

Factor duplicated ff_fast_malloc() out into mem_internal.h · d6ff68ad

Michael Niedermayer authored Jul 11, 2015

internal.h is difficult to use due to circular dependancies
mem.h is a public header ff_* is not public
Alternative solutions probably are possible too
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

d6ff68ad

vf_ssim: remove another obscure double loop. · 03931ecf

Ronald S. Bultje authored Jul 11, 2015

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

03931ecf

ssim: refactor a weird double loop. · a1f48480

Ronald S. Bultje authored Jul 11, 2015

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

a1f48480

avcodec/hevc_parser: Reenable the old parser under ADVANCED_PARSER define · 4496ccc7

Michael Niedermayer authored Jul 13, 2015

Feel free to use either, they both work but the old one provides
more information but needs the hevc decoder
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

4496ccc7