Commits · 87d073eaccc00ef2909445ae4b25128c440d9efa · Linshizhi / ffmpeg.wasm-core

14 Nov, 2012 14 commits

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

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 26 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
- pcmdec: consistently use codec_id, fixes out of array reads · 7373b3ad
  Michael Niedermayer authored Nov 13, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  7373b3ad
- mpegts: prevent freeing ones own section in pat_cb · eab022d8
  Michael Niedermayer authored Nov 13, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  eab022d8
- mov: check stps correctly, avoid overreading 1 element. · 4392e69a
  Michael Niedermayer authored Nov 13, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  4392e69a
- dvdec: check ipcm more completely, avoid assert failure. · 3669915e
  Michael Niedermayer authored Nov 13, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  3669915e
- lavf/wtvenc: fix s[tp]_pairs memleak. · 41ebbb3b
  Clément Bœsch authored Nov 11, 2012
  
  41ebbb3b
- Update iec61883 to handle multiple devices, and allow · 15b02dde
  Georg Lippitsch authored Jul 12, 2012
```
selection of DV device by its GUID
```
  15b02dde
- mpeg4video_parser: init static tables before use, fix nulll ptr deref · 7c76eaec
  Michael Niedermayer authored Nov 13, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  7c76eaec
- mpeg4videodec: split static decoder table init out · 1bd024ec
  Michael Niedermayer authored Nov 13, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  1bd024ec
- x86: h264_weight_10bit: port to cpuflags · 5e9c6ef8
  Diego Biurrun authored Jul 15, 2012
  
  5e9c6ef8
- rv10: consider B frames in low delay streams invalid. · c74cd999
  Michael Niedermayer authored Nov 13, 2012
```
Fix assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  c74cd999
- libtheoraenc: add missing pixdesc.h header · 83f9ed42
  Luca Barbato authored Nov 13, 2012
```
Was left out from c1a02e88.
```
  83f9ed42
- dcadec: check layout & channel count for consistency. · a0212ecf
  Michael Niedermayer authored Nov 13, 2012
```
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  a0212ecf
- avcodec: remove ff_is_hwaccel_pix_fmt · cc085993
  Luca Barbato authored Nov 12, 2012
```
It is used only in one place and is unlikely it would be needed
elsewhere.
```
  cc085993
- pixdesc: add av_pix_fmt_get_chroma_sub_sample · c1a02e88
  Luca Barbato authored Nov 12, 2012
```
Deprecate avcodec_get_chroma_sub_sample.
```
  c1a02e88
- mpegts: dont set stream info when a decoder has already been opened. · 4facddd5
  Michael Niedermayer authored Nov 13, 2012
```
Fixes assertion failure.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  4facddd5
- mpegts: prevent freeing ones own section in pmt_cb · 327cd0d0
  Michael Niedermayer authored Nov 13, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  327cd0d0
- paf: set channel layout · 09a03923
  Paul B Mahol authored Nov 13, 2012
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  09a03923