Commits · 1907ff0a67edeb98d9153aac79f35961837ba3f6 · Linshizhi / ffmpeg.wasm-core

25 Nov, 2014 40 commits

lavc/utils: free private options on avcodec_open2 fail · 1907ff0a

Lukasz Marek authored Nov 22, 2014

It protects leaking string/binary/dict options from priv context.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

1907ff0a

lavu/opt: handle NULL obj in av_opt_next · ea0d8938

Lukasz Marek authored Nov 22, 2014

It indirectly also fixes av_opt_free for NULL objs.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

ea0d8938

lavc/libxvid: return meaningful error codes · 2a89afb3
Lukasz Marek authored Nov 24, 2014
```
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
```
2a89afb3
lavc/avuienc: fix mem leak in case of init failure · e29153f4
Lukasz Marek authored Nov 24, 2014
```
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
```
e29153f4

Merge commit '' · 23e91a1b

Michael Niedermayer authored Nov 25, 2014

* commit 'f20141d7':
  vorbis_parser: Include stdint.h in the header, to make it work standalone

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

23e91a1b

doc: add entry for APNG demuxer where needed. · 155f4dd6
Benoit Fouet authored Nov 25, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
155f4dd6
lavf/avio: clarify the buffer parameter of avio_alloc_context · bc3d02fa
Yu Xiaolei authored Nov 25, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
bc3d02fa

avcodec/huffyuvdec: apply vertical filter in steps of 1 line for interlaced BGRA · 2f1de5ca

Michael Niedermayer authored Nov 25, 2014

Fixes out of array read
Fixes: signal_sigsegv_3287332_2301_cov_2994954934_huffyuv.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

2f1de5ca

avformat/os_support: try to fix build when included from a c++ file like libavdevice/decklink*cpp · d0879a93
Michael Niedermayer authored Nov 25, 2014
```
Found-by: Zeranoe
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
d0879a93

avformat/jacosubdec: Cleanup when avpriv_bprint_to_extradata() fails · 8cd80b5f

Michael Niedermayer authored Nov 25, 2014

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

8cd80b5f

avcodec/utils: Check that the data is complete in avpriv_bprint_to_extradata() · 3d5d95db

Michael Niedermayer authored Nov 25, 2014

Fixes out of array read
Fixes: asan_heap-oob_4d2250_814_cov_2745172097_JACOsub_capability_tester.jss
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

3d5d95db

avcodec/mjpegdec: Fix context fields becoming inconsistent · 0eecf409

Michael Niedermayer authored Nov 25, 2014

Fixes out of array access
Fixes: asan_heap-oob_1ca4f85_2760_cov_144449187_miss_congeniality_pegasus_ljpg.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

0eecf409

vorbis_parser: Include stdint.h in the header, to make it work standalone · f20141d7
Martin Storsjö authored Nov 25, 2014
```
This fixes "make checkheaders".
Signed-off-by: Martin Storsjö <martin@martin.st>
```
f20141d7
avfilter/x86/vf_interlace: remove redundant instructions · ca59b5b6
Michael Niedermayer authored Nov 25, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ca59b5b6

Merge commit '' · 3fe3c8ab

Michael Niedermayer authored Nov 25, 2014

* commit 'ca5c3ff9':
  vf_interlace: x86: improve asm performance

Conflicts:
	libavfilter/x86/vf_interlace.asm

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

3fe3c8ab

Merge commit '' · 8c994528

Michael Niedermayer authored Nov 25, 2014

* commit '57ed5a64':
  hnm4: change width/height to int to fix hypothetical integer overflows

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

8c994528

Merge commit '' · ba1a19bc

Michael Niedermayer authored Nov 25, 2014

* commit '16158da9':
  hnm4: Use av_image_check_size

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

ba1a19bc

Merge commit '' · 0e85a28f

Michael Niedermayer authored Nov 25, 2014

* commit '51946d2d':
  vc1: Use the correct shift amount

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

0e85a28f

Merge commit '' · 79f77ce3

Michael Niedermayer authored Nov 25, 2014

* commit 'd25afb57':
  vc1: Set the is_intra bitfield to all 1 when needed

Conflicts:
	libavcodec/vc1_block.c

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

79f77ce3

Merge commit '' · ed25ca16

Michael Niedermayer authored Nov 25, 2014

* commit 'b6713859':
  vc1: Simplify a little setting the intra variables

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

ed25ca16

Merge commit '' · bcccb2c2

Michael Niedermayer authored Nov 25, 2014

* commit '62e52b94':
  vorbis_parser: Move vp check to avoid a null pointer dereference

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

bcccb2c2

Merge commit '' · a63ec9d5

Michael Niedermayer authored Nov 25, 2014

* commit 'c117da9d':
  lpc: remove unneeded {}

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

a63ec9d5

Merge commit '' · 0aa20883

Michael Niedermayer authored Nov 25, 2014

* commit 'bc75b64c':
  vc1pred: remove logically dead code

Conflicts:
	libavcodec/vc1_pred.c

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

0aa20883

avdevice/decklink_common: Fix "Cross-compiling FFmpeg on Debian for Windows with MinGW-w64" · 1f3d4788
Carl Eugen Hoyos authored Nov 25, 2014
```
Fixes Ticket4130

Requested and Tested by: Zeranoe
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
1f3d4788

Merge remote-tracking branch 'cehoyos/master' · 67dbf8be

Michael Niedermayer authored Nov 25, 2014

* cehoyos/master:
  Include config.h from huffyuvdsp.h.
  Include stddef from snow_dwt.h.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

67dbf8be

doc/print_options: Fix build on mingw after 960aff37 · c724c82a
Michael Niedermayer authored Nov 25, 2014
```
A cleaner fix is very welcome
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
c724c82a

avdevice/dshow: fix build, ensure that feature enable #defines are set before includes · 60420fa3

Michael Niedermayer authored Nov 25, 2014

dshow_capture.h sets up various flags before including windows headers
this must occur before other headers (like os_support.h) include these
headers without the setup

This could be fixed differently but for now this fixes building on mingw
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

60420fa3

vf_interlace: x86: improve asm performance · ca5c3ff9
Michael Niedermayer authored Nov 15, 2014
```
4775 decicycles -> 3688 decicycles
```
ca5c3ff9
hnm4: change width/height to int to fix hypothetical integer overflows · 57ed5a64
Michael Niedermayer authored Nov 12, 2014
```
CC: libav-stable@libav.org
Bug-Id: CID 1135770 / CID 1135771
```
57ed5a64

hnm4: Use av_image_check_size · 16158da9

Luca Barbato authored Nov 24, 2014

As done for all the other codecs not calling it indirectly.

CC: libav-stable@libav.org
Bug-Id: CID 1135770 / CID 1135771

16158da9

vc1: Use the correct shift amount · 51946d2d

Michael Niedermayer authored Nov 23, 2014

`is_intra` is a 6bits bitfield.

CC: libav-stable@libav.org
Bug-Id: CID 1194380 / CID 1194381
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

51946d2d

vc1: Set the is_intra bitfield to all 1 when needed · d25afb57

Luca Barbato authored Nov 23, 2014

Keep the code as similar as possible across the codepaths to
ease spotting it for factorization.

Based on a patch from Michael Niedermayer <michaelni@gmx.at>.

d25afb57

vc1: Simplify a little setting the intra variables · b6713859

Luca Barbato authored Nov 23, 2014

The code currently set the information in at least 4 places, spare
some pointless loops.

Make the code in the loop a little uniform to make easier factorize
it out later.

b6713859

vorbis_parser: Move vp check to avoid a null pointer dereference · 62e52b94
Michael Niedermayer authored Nov 24, 2014
```
CC: libav-stable@libav.org
Bug-Id: CID 1251347
```
62e52b94
lpc: remove unneeded {} · c117da9d
Michael Niedermayer authored Nov 24, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
c117da9d
vc1pred: remove logically dead code · bc75b64c
Vittorio Giovara authored Nov 24, 2014
```
CC: libav-stable@libav.org
Bug-Id: CID 1245699 / CID 1245700
```
bc75b64c

Merge commit '' · ecfafc5f

Michael Niedermayer authored Nov 25, 2014

* commit '960aff37':
  lavf: Use wchar functions for filenames on windows for mkdir/rmdir/rename/unlink

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

ecfafc5f

Merge commit '' · 71ecfcf2

Michael Niedermayer authored Nov 25, 2014

* commit 'b9d08c77':
  lavf: Don't try to update files atomically with renames on windows

Conflicts:
	libavformat/dashenc.c
	libavformat/hdsenc.c
	libavformat/internal.h
	libavformat/smoothstreamingenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

71ecfcf2

Include config.h from huffyuvdsp.h. · 20f3cdf0
Carl Eugen Hoyos authored Nov 25, 2014
```
Fixes a warning about undefined HAVE_BIGENDIAN when running make checkheaders.
```
20f3cdf0
Include stddef from snow_dwt.h. · 0e3ea5b2
Carl Eugen Hoyos authored Nov 25, 2014
```
Fixes make checkheaders.
```
0e3ea5b2