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

18 Feb, 2015 3 commits
- compat/avisynth/windowsPorts/windows2linux: Add () to protect macro arguments · 0babb896
  Michael Niedermayer authored Feb 18, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  0babb896
- avcodec/wavpack: Add () to protect the arguments of UPDATE_WEIGHT_CLIP() · b7c19aee
  Michael Niedermayer authored Feb 18, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  b7c19aee
- avcodec/wmalosslessdec: Add () to protect the arguments of WMASIGN() · dfc2a398
  Michael Niedermayer authored Feb 18, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  dfc2a398
17 Feb, 2015 37 commits

libavutil: optimize twofish cipher · 092ee6cd

Supraja Meedinti authored Feb 17, 2015

before:
lavu       TWOFISH      size: 1048576  runs:   1024  time:   90.052 +- 4.630
after:
lavu       TWOFISH      size: 1048576  runs:   1024  time:   18.085 +- 0.241
gcrypt     TWOFISH      size: 1048576  runs:   1024  time:   25.666 +- 0.307
tomcrypt   TWOFISH      size: 1048576  runs:   1024  time:   18.428 +- 0.363
Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

092ee6cd

Merge commit '' · 77ae9472

Michael Niedermayer authored Feb 17, 2015

* commit '195942ed':
  riff: Support QT RLE Animation in avi ('rle ' FourCC)
Merged-by: Michael Niedermayer <michaelni@gmx.at>

77ae9472

Merge commit '' · 97bd0e2a

Michael Niedermayer authored Feb 17, 2015

* commit 'c78dc121':
  riff: Support ProRes in avi (APCH fourcc)
Merged-by: Michael Niedermayer <michaelni@gmx.at>

97bd0e2a

Merge commit '' · d06dce21

Michael Niedermayer authored Feb 17, 2015

* commit '42c8f92e':
  wmv2: Return meaningful error codes

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

d06dce21

Merge commit '' · 41572ac6

Michael Niedermayer authored Feb 17, 2015

* commit 'f3e04526':
  qdm2: Return meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

41572ac6

Merge commit '' · d128794f

Michael Niedermayer authored Feb 17, 2015

* commit 'a1e2c47c':
  libxvid: Return meaningful error messages

Conflicts:
	libavcodec/libxvid.c
	libavcodec/libxvid_rc.c

See: 2a89afb3 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

d128794f

avcodec/aac_adtstoasc_bsf: Clear extradata_size on allocation failure · 2e786bc4
Michael Niedermayer authored Feb 17, 2015
```
This keeps the fields consistent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
2e786bc4

Merge commit '' · 38e867f6

Michael Niedermayer authored Feb 17, 2015

* commit '18f4fa25':
  aac_adtstoasc_bsf: Check extradata memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

38e867f6

Merge commit '' · 62aec0c2

Michael Niedermayer authored Feb 17, 2015

* commit 'fe0f4e56':
  avpacket: Check buffer reference

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

62aec0c2

Merge commit '' · 7a7b77e6

Michael Niedermayer authored Feb 17, 2015

* commit '31dc73e9':
  vorbisdec: Check memory allocations

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

7a7b77e6

Merge commit '' · 3d5c0ba8

Michael Niedermayer authored Feb 17, 2015

* commit 'ec17782e':
  dvdsubdec: Check memory allocations

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

3d5c0ba8

Merge commit '' · 2a1b79d7

Michael Niedermayer authored Feb 17, 2015

* commit 'e51f2212':
  swscale: Check memory allocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2a1b79d7

Merge commit '' · 880cee00

Michael Niedermayer authored Feb 17, 2015

* commit '3035d21b':
  nutdec: Check memory allocations

Conflicts:
	libavformat/nutdec.c

See: 55ae13e3
See: 269845dbMerged-by: Michael Niedermayer <michaelni@gmx.at>

880cee00

avformat/movenc: Fix stts_entries allocation check · 95165f7c
Michael Niedermayer authored Feb 17, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
95165f7c

Merge commit '' · 80c5dc56

Michael Niedermayer authored Feb 17, 2015

* commit 'a8765852':
  movenc: Check memory allocations

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

80c5dc56

Merge commit '' · 575ed4fe

Michael Niedermayer authored Feb 17, 2015

* commit 'da7e31a2':
  rmdec: Check memory allocations from ff_rm_alloc_rmstream()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

575ed4fe

Merge commit '' · beae6ac5

Michael Niedermayer authored Feb 17, 2015

* commit 'd89e58f5':
  dct-test: Fix initialization syntax

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

beae6ac5

Merge commit '' · 563ed912

Michael Niedermayer authored Feb 17, 2015

* commit 'bb770168':
  lavf: Document the codec context initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at>

563ed912

Merge commit '' · 2980c8e7

Michael Niedermayer authored Feb 17, 2015

* commit 'cb70a93c':
  lavc: Document interaction between avcodec_open2() and decoding routines

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

2980c8e7

Merge commit '' · 79216a18

Michael Niedermayer authored Feb 17, 2015

* commit '733f4b05':
  avplay: Check format allocation inside decode_thread()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

79216a18

Merge commit '' · 32b2b7bd

Michael Niedermayer authored Feb 17, 2015

* commit '266f2411':
  avplay: Check frame allocation inside video_thread()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

32b2b7bd

Merge commit '' · 15cd2a93

Michael Niedermayer authored Feb 17, 2015

* commit '81688e68':
  avconv: Check rc_override memory allocation

Conflicts:
	ffmpeg_opt.c

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

15cd2a93

Merge commit '' · 9d5017a2

Michael Niedermayer authored Feb 17, 2015

* commit '9d3b752f':
  graphparser: Check av_get_token() memory error
Merged-by: Michael Niedermayer <michaelni@gmx.at>

9d5017a2

avformat/matroskaenc: Use the correct data type for the chapter times · a4cd057b
Michael Niedermayer authored Feb 17, 2015
```
Fixes potential integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
a4cd057b

Merge commit '' · d302853b

Michael Niedermayer authored Feb 17, 2015

* commit '5dc47a2b':
  matroskaenc: Validate chapter start and end times

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

d302853b

Merge commit '' · d2668ae4

Michael Niedermayer authored Feb 17, 2015

* commit 'f8c17197':
  dca: Remove separate header for DCA ExSS

Conflicts:
	libavcodec/dca.h
	libavcodec/dca_exss.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

d2668ae4

avcodec/vp56: Add () to protect TRANSPOSE()s arguments · 03dab49a
Michael Niedermayer authored Feb 17, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
03dab49a
riff: Support QT RLE Animation in avi ('rle ' FourCC) · 195942ed
Vittorio Giovara authored Feb 12, 2015
```
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
```
195942ed
riff: Support ProRes in avi (APCH fourcc) · c78dc121
Vittorio Giovara authored Feb 10, 2015
```
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
```
c78dc121
wmv2: Return meaningful error codes · 42c8f92e
Himangi Saraogi authored Feb 15, 2015

42c8f92e
qdm2: Return meaningful error codes · f3e04526
Himangi Saraogi authored Feb 15, 2015

f3e04526
libxvid: Return meaningful error messages · a1e2c47c
Himangi Saraogi authored Feb 10, 2015

a1e2c47c
aac_adtstoasc_bsf: Check extradata memory allocation · 18f4fa25
Himangi Saraogi authored Feb 10, 2015
```
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
```
18f4fa25
avpacket: Check buffer reference · fe0f4e56
Vittorio Giovara authored Feb 02, 2015
```
CC: libav-stable@libav.org
Bug-Id: CID 1267889
```
fe0f4e56
vorbisdec: Check memory allocations · 31dc73e9
Vittorio Giovara authored Feb 02, 2015

31dc73e9
dvdsubdec: Check memory allocations · ec17782e
Vittorio Giovara authored Feb 02, 2015

ec17782e

swscale: Check memory allocations · e51f2212

Federico Tomassetti authored Feb 15, 2015

CC: libav-stable@libav.org
Bug-Id: CID 1267888 / CID 1267890
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

e51f2212