Commits · f8932d990228c53ee498b17eadf9dae4755c87ab · Linshizhi / ffmpeg.wasm-core

12 Sep, 2013 6 commits

Michael Niedermayer authored Sep 12, 2013

* commit '0679cec6':
  smacker: Make sure we don't fill in huffman codes out of range

Conflicts:
	libavcodec/smacker.c

See: 1285baaa
the added test is redundant but will be used after future refactoring
Merged-by: Michael Niedermayer <michaelni@gmx.at>

f8932d99

Merge commit '' · d510d70d

Michael Niedermayer authored Sep 12, 2013

* commit 'd002fce2':
  smacker: Check malloc return values

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

d510d70d

Merge commit '' · c16cd555

Michael Niedermayer authored Sep 12, 2013

* commit '710b0e27':
  smacker: Avoid integer overflow when allocating packets
Merged-by: Michael Niedermayer <michaelni@gmx.at>

c16cd555

Merge commit '' · 33cf70a8

Michael Niedermayer authored Sep 12, 2013

* commit '8d928023':
  smacker: Don't return packets in unallocated streams
Merged-by: Michael Niedermayer <michaelni@gmx.at>

33cf70a8

Merge commit '' · 7e88dbe9

Michael Niedermayer authored Sep 12, 2013

* commit '48d6556d':
  dsicin: Add some basic sanity checks for fields read from the file
Merged-by: Michael Niedermayer <michaelni@gmx.at>

7e88dbe9

Merge commit '' · ae77f06c

Michael Niedermayer authored Sep 12, 2013

* commit '5045f6bd':
  configure: Fix wrong reference to user support mailing list

Conflicts:
	configure

No change as the reference was not wrong in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

ae77f06c

11 Sep, 2013 34 commits

lavu/sha512: Fully unroll the transform function loops · bbcaf25d

James Almer authored Sep 09, 2013

crypto_bench SHA-512 results using an AMD Athlon X2 7750+, mingw32-w64 GCC 4.7.3 x86_64

Before:
lavu       SHA-512      size: 1048576  runs:   1024  time:   12.737 +- 0.147

After:
lavu       SHA-512      size: 1048576  runs:   1024  time:   11.670 +- 0.173
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

bbcaf25d

lavu/sha: Fully unroll the transform function loops · 7e4fe516

James Almer authored Sep 09, 2013

crypto_bench SHA-1 and SHA-256 results using an AMD Athlon X2 7750+, mingw32-w64 GCC 4.7.3 x86_64

Before:
lavu       SHA-1        size: 1048576  runs:   1024  time:    9.012 +- 0.162
lavu       SHA-256      size: 1048576  runs:   1024  time:   19.625 +- 0.173

After:
lavu       SHA-1        size: 1048576  runs:   1024  time:    7.948 +- 0.154
lavu       SHA-256      size: 1048576  runs:   1024  time:   17.841 +- 0.170
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

7e4fe516

smacker: Make sure we don't fill in huffman codes out of range · 0679cec6

Martin Storsjö authored Sep 11, 2013

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

0679cec6

smacker: Check malloc return values · d002fce2

Martin Storsjö authored Sep 11, 2013

Also try to free local allocations on errors.
Signed-off-by: Martin Storsjö <martin@martin.st>

d002fce2

smacker: Avoid integer overflow when allocating packets · 710b0e27

Martin Storsjö authored Sep 11, 2013

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

710b0e27

smacker: Don't return packets in unallocated streams · 8d928023

Martin Storsjö authored Sep 11, 2013

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

8d928023

dsicin: Add some basic sanity checks for fields read from the file · 48d6556d

Martin Storsjö authored Sep 11, 2013

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

48d6556d

avfilter: remove redundant use of AV_NE() macro · a8e00cf9
Paul B Mahol authored Sep 11, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
a8e00cf9
avformat/nutdec: check for allocation failures · 269845db
Paul B Mahol authored Sep 11, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
269845db
avfilter/vf_traspose: move switch out of loop · 99a28333
Paul B Mahol authored Sep 11, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
99a28333

avcodec: add const qualifier to avcodec_find_best_pix_fmt2 args · 38155b47

Dylan Alex Simon authored Aug 13, 2013

avcodec_find_best_pix_fmt2 does not modify its first argument so may be
marked const.  This avoids a warning when passing in AVCodec.pix_fmts.
Signed-off-by: Dylan Simon <dylan@dylex.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

38155b47

configure: Fix wrong reference to user support mailing list · 5045f6bd
Diego Biurrun authored Sep 10, 2013

5045f6bd
avformat/utils: use av_realloc_array() · 2a1c24a2
Michael Niedermayer authored Sep 11, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
2a1c24a2
avformat/mxfdec: use av_realloc_array() · c5714097
Michael Niedermayer authored Sep 11, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
c5714097
avformat/matroskaenc: use av_realloc_array() · 9bca8e53
Michael Niedermayer authored Sep 11, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
9bca8e53
avformat/matroskadec: use av_realloc_array() · e5290823
Michael Niedermayer authored Sep 11, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
e5290823
avformat/matroskaenc: use av_freep() to avoid leaving stale pointers · b5b34c19
Michael Niedermayer authored Sep 11, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
b5b34c19
avformat/asfenc: use av_freep() for extra saftey · 2175f768
Michael Niedermayer authored Sep 11, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
2175f768
avformat/gxfenc: Clear nb_fields on array deallocation · 2832a82e
Michael Niedermayer authored Sep 11, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
2832a82e
avformat/gxfenc: Check and propagate return code from gxf_write_map_packet() · a6ca08f1
Michael Niedermayer authored Sep 11, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
a6ca08f1
avformat/smacker: check avformat_new_stream() return value · 9e505485
Paul B Mahol authored Sep 11, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
9e505485
avformat/libnut: check avformat_new_stream() return value · 848ad8db
Paul B Mahol authored Sep 11, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
848ad8db
avformat/ffmetadec: return meaningful error codes · f2e614e7
Paul B Mahol authored Sep 11, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
f2e614e7
avformat/sierravmd: check for memory allocation failures · 60caa3d8
Paul B Mahol authored Sep 11, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
60caa3d8
avformat/flic: check for memory allocation failures · 00e1bf8a
Paul B Mahol authored Sep 10, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
00e1bf8a

Merge remote-tracking branch 'qatar/master' · 803445e0

Michael Niedermayer authored Sep 11, 2013

* qatar/master:
  Drop pointless directory name prefixes from #includes in the current dir
Merged-by: Michael Niedermayer <michaelni@gmx.at>

803445e0

Merge commit '' · c45e9097

Michael Niedermayer authored Sep 11, 2013

* commit 'ec17d1aa':
  doc: Drop VDPAU from list of supported codecs
Merged-by: Michael Niedermayer <michaelni@gmx.at>

c45e9097

Merge commit '' · 24da9eb2

Michael Niedermayer authored Sep 11, 2013

* commit 'c58f4069':
  fate.sh: Run git-clone quietly
Merged-by: Michael Niedermayer <michaelni@gmx.at>

24da9eb2

avformat/utils: functions that add entries should not destroy the whole list on failure · 8c9d6ee4

Michael Niedermayer authored Sep 11, 2013

The caller does not expect this, and in case of adding new streams would then
not even be able to deallocate them anymore.

This reverts a hunk from "avformat: Use av_reallocp_array() where suitable"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

8c9d6ee4

avformat/mxfdec: functions that add entries should not destroy the whole list on failure · 5ca39a0b

Michael Niedermayer authored Sep 11, 2013

The caller does not expect this and there are variables left that index to otherwise
deallocated data.

This reverts a hunk from "avformat: Use av_reallocp_array() where suitable"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

5ca39a0b

avformat/matroskaenc: functions that add entries should not destroy the whole list on failure · c9367c07
Michael Niedermayer authored Sep 11, 2013
```
This reverts a hunk from "avformat: Use av_reallocp_array() where suitable"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
c9367c07
avformat/matroskadec: ebml_parse_elem() should not deallocate priorly existing lists on failure · 32805f85
Michael Niedermayer authored Sep 11, 2013
```
This reverts a hunk from "avformat: Use av_reallocp_array() where suitable"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
32805f85

Merge commit '' · cbe47b1e

Michael Niedermayer authored Sep 11, 2013

* commit 'f369b935':
  avformat: Use av_reallocp_array() where suitable

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

cbe47b1e

avcodec/mjpegdec: Support >8bpc color mjpeg · 64b6279d
Michael Niedermayer authored Sep 11, 2013
```
Fixes Ticket2939
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
64b6279d