Commits · e9d646f44c6a3208e35a055ba2154f25ba497fa2 · Linshizhi / ffmpeg.wasm-core

30 May, 2015 13 commits
- Merge commit '0181ae9a' · e9d646f4
  Michael Niedermayer authored May 30, 2015
```
* commit '0181ae9a':
  h264: Make sure reinit failures mark the context as not initialized

Conflicts:
	libavcodec/h264_slice.c

See: e8714f6fMerged-by: Michael Niedermayer <michaelni@gmx.at>
```
  e9d646f4
- Merge commit '5ecabd3c' · 7d1cfbbc
  Michael Niedermayer authored May 30, 2015
```
* commit '5ecabd3c':
  msrle: Use FFABS to determine the frame size in msrle_decode_pal4

Conflicts:
	libavcodec/msrledec.c

See: f7e1367fMerged-by: Michael Niedermayer <michaelni@gmx.at>
```
  7d1cfbbc
- libopenjpegdec: check existence of image component data · 3ef57029
  Andreas Cadhalpun authored May 30, 2015
```
libopenjpeg can return images with components without data.

This fixes segmentation faults.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
```
  3ef57029
- doc/ffmpeg: Document xerror · 161d0ac7
  Michael Niedermayer authored May 30, 2015
```
Previous version reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  161d0ac7
- avformat/movenc: Add loction/xyz support to allow copying data between mov files · a3ec1d6a
  Michael Niedermayer authored May 30, 2015
```
Fixes Ticket4337
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  a3ec1d6a
- h264: Make sure reinit failures mark the context as not initialized · 0181ae9a
  Luca Barbato authored May 25, 2015
```
Bug-Id: CVE-2015-3417
CC: libav-stable@libav.org
```
  0181ae9a
- msrle: Use FFABS to determine the frame size in msrle_decode_pal4 · 5ecabd3c
  Luca Barbato authored May 25, 2015
```
As done in msrle_decode_8_16_24_32.

Bug-Id: CVE-2015-3395
CC: libav-stable@libav.org
```
  5ecabd3c
- avformat/mov: Also export loci altitude · 08b7d19d
  Michael Niedermayer authored May 30, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  08b7d19d
- avformat/mov: Append place name instead of overwriting for loci · 1607f774
  Michael Niedermayer authored May 30, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  1607f774
- lavf/tls_securetransport: add missing copyright notice · 4dd22531
  Rodger Combs authored May 30, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  4dd22531
- avcodec/dvbsubdec: Fix buf_size check in dvbsub_parse_display_definition_segment() · debf4d6e
  banastasov authored May 30, 2015
```
Fixes Ticket4326
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  debf4d6e
- avformat/h264dec: Add ff_tlog() with trace information about h264 probing · aa9c6b69
  Michael Niedermayer authored May 30, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  aa9c6b69
- avformat/h264dec: Fix detection of invalid h264 with 0x100 startcodes · dae89802
  Michael Niedermayer authored May 30, 2015
```
Fies Ticket4325
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  dae89802
29 May, 2015 27 commits

Michael Niedermayer authored May 29, 2015

* commit 'b2f0f37d':
  rtmpdh: Generate the whole private exponent using av_get_random_seed() with nettle/gmp
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2e15f07c

rtmpdh: Generate the whole private exponent using av_get_random_seed() with nettle/gmp · b2f0f37d

Martin Storsjö authored May 29, 2015

Don't use a PRNG for generating it; that defies the intended use
within the cryptograhic handshake.
Signed-off-by: Martin Storsjö <martin@martin.st>

b2f0f37d

lavf/tls: Support Secure Transport · f24d92ba
Rodger Combs authored May 28, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
f24d92ba

configure: Fix showcqt fft dependancy · bedb5d58

Michael Niedermayer authored May 29, 2015

Found-by: Muhammad Faiz <mfcc64@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

bedb5d58

build: add configure option pkgconfigdir · 083b1a32

Ingo Brückl authored May 29, 2015

This allows the user to override the directory for the installation
of the pkg-config files (from the default LIBDIR/pkgconfig).

It follows the usual behaviour of Makefiles generated by automake.
Signed-off-by: Ingo Brückl <ib@wupperonline.de>
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

083b1a32

libavutil: Cosmetic changes to fixed_dsp file. · e374405d

Nedeljko Babic authored May 29, 2015

Names of functions vector_fmul_window_fixed_c and
vector_fmul_window_fixed_scaled_c are changed by removing "_fixed"
from the name since it is redundant.
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

e374405d

mov: fix DTS calculation for samples with negative stts duration · 153639cb

Andreas Cadhalpun authored May 27, 2015

A negative sample duration is invalid according to the spec, but there
are samples that use it for the DTS calculation, e.g.:
http://files.1f0.de/samples/mp4-negative-stts-problem.mp4

These currently get out of A/V sync.

Also change the logging type to AV_LOG_WARNING, because decoding the
sample can continue.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

153639cb

avcodec/mpegvideo: Use FFSWAP to exchange pointers · 403940de
Michael Niedermayer authored May 29, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
403940de
avcodec/ac3_parser: Avoid floats in bitrate computation · f86e7c5d
Michael Niedermayer authored May 29, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
f86e7c5d
avformat/movenc: Check that track_width_1616 fits within the available 32bit before storing it · 061a592b
Michael Niedermayer authored May 29, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
061a592b

avformat/movenc: avoid floats in width/height/aspect ratio computations · 14bc5704

Michael Niedermayer authored May 29, 2015

This avoids the possibility for rounding/precision differences between platforms
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

14bc5704

avformat/concatdec: Enable auto_convert by default · 3331213e

Michael Niedermayer authored May 26, 2015

Users have no means to find out from a failure how to make it work
or is it preferred to check and print a warning for h264 concat without auto_convert ?
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

3331213e

avformat/mov: Avoid float usage in yuv_to_rgba() · e1b00195

Michael Niedermayer authored May 29, 2015

This avoids the possibility for rounding/precision differences between platforms
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

e1b00195

Merge commit '' · 4b8b3efb

Michael Niedermayer authored May 29, 2015

* commit 'e9e86d9e':
  rtmpdh: Create sufficiently long private keys for gcrypt/nettle
Merged-by: Michael Niedermayer <michaelni@gmx.at>

4b8b3efb

Merge commit '' · 42a6a384

Michael Niedermayer authored May 29, 2015

* commit '8016a1bd':
  rtmpdh: Remove an unnecessary check in the gcrypt/nettle dh_compute_key
Merged-by: Michael Niedermayer <michaelni@gmx.at>

42a6a384

Merge commit '' · 48e02e25

Michael Niedermayer authored May 29, 2015

* commit '063f7467':
  rtmpdh: Add fate test for the DH handshake routine
Merged-by: Michael Niedermayer <michaelni@gmx.at>

48e02e25

Merge commit '' · fbeb3fa9

Michael Niedermayer authored May 29, 2015

* commit '0508faaa':
  rtmpdh: Pass the actual buffer size of the output secret key
Merged-by: Michael Niedermayer <michaelni@gmx.at>

fbeb3fa9

Merge commit '' · beecbe13

Michael Niedermayer authored May 29, 2015

* commit '9f1b3050':
  rtmpdh: Check the output buffer size in the openssl version of dh_compute_key
Merged-by: Michael Niedermayer <michaelni@gmx.at>

beecbe13

Merge commit '' · 4c0b30b0

Michael Niedermayer authored May 29, 2015

* commit '127d813b':
  rtmpdh: Fix a local variable name in the nettle/gcrypt codepath
Merged-by: Michael Niedermayer <michaelni@gmx.at>

4c0b30b0

Merge commit '' · 392832fc

Michael Niedermayer authored May 29, 2015

* commit '78efc69e':
  rtmpdh: Make sure ret is initialized in the nettle version of bn_hex2bn
Merged-by: Michael Niedermayer <michaelni@gmx.at>

392832fc

rtmpdh: Create sufficiently long private keys for gcrypt/nettle · e9e86d9e

Martin Storsjö authored May 28, 2015

There was a misunderstanding betewen bits and bytes for the parameter
value for generating random big numbers.
Signed-off-by: Martin Storsjö <martin@martin.st>

e9e86d9e

rtmpdh: Remove an unnecessary check in the gcrypt/nettle dh_compute_key · 8016a1bd
Martin Storsjö authored May 28, 2015
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
8016a1bd

rtmpdh: Add fate test for the DH handshake routine · 063f7467

Martin Storsjö authored May 28, 2015

This helps if these functions need to be implemented using another
crypto API.
Signed-off-by: Martin Storsjö <martin@martin.st>

063f7467

rtmpdh: Pass the actual buffer size of the output secret key · 0508faaa
Martin Storsjö authored May 28, 2015
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
0508faaa
rtmpdh: Check the output buffer size in the openssl version of dh_compute_key · 9f1b3050
Martin Storsjö authored May 28, 2015
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
9f1b3050
rtmpdh: Fix a local variable name in the nettle/gcrypt codepath · 127d813b
Martin Storsjö authored May 28, 2015
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
127d813b
rtmpdh: Make sure ret is initialized in the nettle version of bn_hex2bn · 78efc69e
Martin Storsjö authored May 28, 2015
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
78efc69e