Commits · 4d941eac1655b21af33c6e4d52b7bfd7f9e5b990 · Linshizhi / ffmpeg.wasm-core

15 Nov, 2012 3 commits

Michael Niedermayer authored Nov 15, 2012

* commit '3b4296f4':
  avformat: clarify stream id for muxing
  fate: Add dependencies for aac, alac, amrnb, amrwb, atrac tests
  ppc: do not pass redundant compiler flags
  avutil: change GET_UTF8 to not use av_log2()
  segment: fix NULL pointer dereference in seg_write_header()

Conflicts:
	tests/fate/aac.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

4d941eac

ituh263dec: more complete w/h check. · 62006b53

Michael Niedermayer authored Nov 15, 2012

Fixes a division by 0

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

62006b53

rv10: always check image size not just in some cases. · caa2fa2c

Michael Niedermayer authored Nov 15, 2012

Fixes division by 0

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

caa2fa2c

14 Nov, 2012 28 commits

xwma: check bytes_per_sample, fix division by 0. · a3cb7f99

Michael Niedermayer authored Nov 14, 2012

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

a3cb7f99

dxa: dont try to use the previous frame if there is none. · 12eb2fd5

Michael Niedermayer authored Nov 14, 2012

Fixes null pointer dereference.

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

12eb2fd5

bink: check quant_index, fix out of array read · e70144cb

Michael Niedermayer authored Nov 14, 2012

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

e70144cb

gifdec: check ff_lzw_decode_init() return value, fix out of array reads · 612ecfbb
Michael Niedermayer authored Nov 14, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
612ecfbb
wmaprodec: check num_sfb for validity. Fix out of array accesses · 50f0a6b4
Michael Niedermayer authored Nov 14, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
50f0a6b4
avformat: clarify stream id for muxing · 3b4296f4
Luca Barbato authored Nov 10, 2012

3b4296f4
vpriv_adx_decode_header: avoid underreading the array. · 30bce34b
Michael Niedermayer authored Nov 14, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
30bce34b
vc1dec: require a minimum of 2x2 for the edge pos. Avoid assertion failure · ab8517b8
Michael Niedermayer authored Nov 14, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ab8517b8
Add missing dependency for avr demuxer · dbc44667
Paul B Mahol authored Nov 14, 2012
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
dbc44667
vc1dec: check first field slices, fix out of array read. · ccce723c
Michael Niedermayer authored Nov 14, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ccce723c
fate: Add dependencies for aac, alac, amrnb, amrwb, atrac tests · a3138ebf
Diego Biurrun authored Oct 19, 2012

a3138ebf

ppc: do not pass redundant compiler flags · 7f1fcaf0

Mans Rullgard authored Nov 14, 2012

The -mpowerpc64 and -mpowerpc-gfxopt flags are implicitly set by
-mcpu as needed.  Passing them explicitly is redundant and can
conflict with user-supplied flags.
Signed-off-by: Mans Rullgard <mans@mansr.com>

7f1fcaf0

avutil: change GET_UTF8 to not use av_log2() · 7ba0c1b3

Mans Rullgard authored Nov 13, 2012

This removes an inter-library dependency on ff_log2_tab causing
linking errors in some configurations.
Signed-off-by: Mans Rullgard <mans@mansr.com>

7ba0c1b3

mov: Dont try to calculate with unknown durations, fix division by 0 · 87d073ea
Michael Niedermayer authored Nov 14, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
87d073ea

Merge remote-tracking branch 'qatar/master' · a1b5c963

Michael Niedermayer authored Nov 14, 2012

* qatar/master:
  x86: mmx2 ---> mmxext in asm constructs

Conflicts:
	libavcodec/x86/h264_chromamc_10bit.asm
	libavcodec/x86/h264_deblock.asm
	libavcodec/x86/h264dsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

a1b5c963

Merge commit '' · b0c543b1

Michael Niedermayer authored Nov 14, 2012

Not merged, its not broken

* commit 'da39cac8':
  Drop broken and unused CABAC test program.

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

b0c543b1

Remove deprecation of avcodec_get_chroma_sub_sample. · d4e74d5d

Michael Niedermayer authored Nov 14, 2012

Add explanations what the difference between the 2 functions are and
when either should be used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

d4e74d5d

Merge commit '' · e13d5e9a

Michael Niedermayer authored Nov 14, 2012

* commit '5e9c6ef8':
  x86: h264_weight_10bit: port to cpuflags
  libtheoraenc: add missing pixdesc.h header
  avcodec: remove ff_is_hwaccel_pix_fmt
  pixdesc: add av_pix_fmt_get_chroma_sub_sample
  hlsenc: stand alone hls segmenter

Conflicts:
	doc/muxers.texi
	libavcodec/ffv1enc.c
	libavcodec/imgconvert.c
	libavcodec/mpegvideo_enc.c
	libavcodec/tiffenc.c
	libavformat/Makefile
	libavformat/allformats.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

e13d5e9a

segment: fix NULL pointer dereference in seg_write_header() · e8769b37

Xi Wang authored Nov 14, 2012

Since the pointer `oc' is NULL, oc->oformat->name will cause a null
pointer dereference.  This patch changes it to seg->oformat->name.
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>

e8769b37

ffserver: fix NULL dereference with quoted Stream name. · 26afdbcf
Clément Bœsch authored Nov 14, 2012

26afdbcf
ffserver: prefer av_asprintf over malloc+snprintf for Launch setting. · a9ba9268
Clément Bœsch authored Nov 14, 2012

a9ba9268
8bps: check index against buffer size before reading line length pointer. · 66ff90f4
Michael Niedermayer authored Nov 14, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
66ff90f4

mpeg12data: increase size of ff_mpeg1_default_intra_matrix to prevent harmless... · 7acee665

Michael Niedermayer authored Nov 14, 2012

mpeg12data: increase size of ff_mpeg1_default_intra_matrix to prevent harmless overreads from crashing

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

7acee665

aasc: check before reading the first 4 byte, fix overread · e1631f8e
Michael Niedermayer authored Nov 14, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
e1631f8e
vmnc: check input size before reading chunk header, fix overread · 39c5cd60
Michael Niedermayer authored Nov 14, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
39c5cd60

Merge remote-tracking branch 'lippit/master' · b6165882

Michael Niedermayer authored Nov 14, 2012

* lippit/master:
  Update iec61883 to handle multiple devices, and allow selection of DV device by its GUID
Merged-by: Michael Niedermayer <michaelni@gmx.at>

b6165882

ffmpeg: fix double ;; · 9f088712
Michael Niedermayer authored Nov 14, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
9f088712
ffmpeg: fix audio timestamps on stream copy with -ss · 9406d6be
Michael Niedermayer authored Nov 14, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
9406d6be

13 Nov, 2012 9 commits
- x86: mmx2 ---> mmxext in asm constructs · 26301caa
  Diego Biurrun authored Jul 09, 2012
  
  26301caa
- Drop broken and unused CABAC test program. · da39cac8
  Diego Biurrun authored Oct 05, 2012
  
  da39cac8
- imc: sanity check scalefactors. · 2f74f8d7
  Michael Niedermayer authored Nov 13, 2012
```
This fixes undefined behavior

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  2f74f8d7
- lxfdec: fix "no audio stream" check. avoid null ptrs deref · 1f196051
  Michael Niedermayer authored Nov 13, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  1f196051
- lavfi/frei0r: add additional trailing slash in FREI0R_PATH paths · 334a0d15
  Stefano Sabatini authored Oct 29, 2012
```
Allow to accept paths with no ending trailing slash.

Based on a patch by rogerdpack <rogerpack2005@gmail.com>.
```
  334a0d15
- lavfi/frei0r: correctly handle paths longer than 1023 chars · 9a2028d4
  Stefano Sabatini authored Oct 29, 2012
  
  9a2028d4
- av_probe_input_format3: support NULL as buffer. Fixes null ptr deref · af9ec3dd
  Michael Niedermayer authored Nov 13, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  af9ec3dd
- alac: check channel count more completely, fix out of array read · 001af703
  Michael Niedermayer authored Nov 13, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  001af703
- avrndec: calculate true_height only when used. · b1191331
  Michael Niedermayer authored Nov 13, 2012
```
Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  b1191331