Commits · 5dd78ef34e2070b17164d646781c0cf9a8e0550f · Linshizhi / ffmpeg.wasm-core

13 Feb, 2013 30 commits

WAV muxer: reindent · 5dd78ef3
Daniel Verkamp authored Feb 12, 2013

5dd78ef3

swr: check channel layouts before using them. · 21cd905c

Michael Niedermayer authored Feb 13, 2013

Fixes out of array accesses

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

21cd905c

lavfi/transpose: support more pix fmts · 34126cd0
Paul B Mahol authored Feb 12, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
34126cd0
lavu/intreadwrite: add AV_[RW][BLN]48 · cf73e0bf
Paul B Mahol authored Feb 13, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
cf73e0bf
libvorbisdec: Remove AVFrame from context · 324d9664
Michael Niedermayer authored Feb 13, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
324d9664
libvorbisdec: set sample type · fe845772
Michael Niedermayer authored Feb 13, 2013
```
Fixes regression
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
fe845772
libcelt: decode directly to the user-provided AVFrame. · a17ececc
Nicolas George authored Feb 13, 2013

a17ececc
lavf/concatdec: allow probing. · b68dd8a1
Nicolas George authored Feb 03, 2013

b68dd8a1
lavf/concatdec: add signature directive. · db9dc515
Nicolas George authored Feb 03, 2013

db9dc515
lavf/concatdec: add safe option. · 6d680d20
Nicolas George authored Feb 03, 2013

6d680d20

mjpegdec: pass nb_components into ljpeg_decode_yuv_scan · b2e57eb5

Michael Niedermayer authored Feb 13, 2013

Fixes null pointer dereference

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

b2e57eb5

evrcdec: decode directly to the user-provided AVFrame · 8f7c7ff2
Paul B Mahol authored Feb 13, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
8f7c7ff2
paf: decode directly to the user-provided AVFrame · 2cced2a8
Paul B Mahol authored Feb 13, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
2cced2a8
vima: decode directly to the user-provided AVFrame · 9145818e
Paul B Mahol authored Feb 13, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
9145818e

Merge remote-tracking branch 'qatar/master' · 845fa2f5

Michael Niedermayer authored Feb 13, 2013

* qatar/master:
  lavr: fix mixing matrix reduction when normalization is disabled
  lavr: fix matrix reduction for upmixing in certain cases
  lavr: cosmetics: reindent
Merged-by: Michael Niedermayer <michaelni@gmx.at>

845fa2f5

Merge commit '' · 91043de8

Michael Niedermayer authored Feb 13, 2013

* commit '1647da89':
  lavr: make sure that the mix function is reset even if no mixing will be done
  lavr: print out the mix matrix in ff_audio_mix_set_matrix()
  ws-snd1: decode directly to the user-provided AVFrame
  wmavoice: decode directly to the user-provided AVFrame
Merged-by: Michael Niedermayer <michaelni@gmx.at>

91043de8

Merge commit '' · 0dff771f

Michael Niedermayer authored Feb 13, 2013

* commit '205a95f7':
  wmaenc: alloc/free coded_frame instead of keeping it in the WMACodecContext
  wma: decode directly to the user-provided AVFrame
  wmapro: decode directly to the user-provided AVFrame
  wavpack: decode directly to the user-provided AVFrame

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

0dff771f

Merge commit '' · dca6fb08

Michael Niedermayer authored Feb 13, 2013

* commit 'ee6ca11b':
  vorbis: decode directly to the user-provided AVFrame
  vmdaudio: decode directly to the user-provided AVFrame
  twinvq: decode directly to the user-provided AVFrame
  tta: decode directly to the user-provided AVFrame
  truespeech: decode directly to the user-provided AVFrame

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

dca6fb08

Merge commit '' · 2becf21d

Michael Niedermayer authored Feb 13, 2013

* commit '4a2b26fc':
  tak: decode directly to the user-provided AVFrame
  smackaud: decode directly to the user-provided AVFrame
  sipr: decode directly to the user-provided AVFrame
  shorten: decode directly to the user-provided AVFrame

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

2becf21d

Merge commit '' · 08059f61

Michael Niedermayer authored Feb 13, 2013

* commit '5d5c248c':
  s302m: decode directly to the user-provided AVFrame
  ra288: decode directly to the user-provided AVFrame
  ra144: decode directly to the user-provided AVFrame
  ralf: decode directly to the user-provided AVFrame
  qdm2: decode directly to the user-provided AVFrame
Merged-by: Michael Niedermayer <michaelni@gmx.at>

08059f61

Merge commit '' · 65da7007

Michael Niedermayer authored Feb 13, 2013

* commit '1b9b6d6e':
  qcelp: decode directly to the user-provided AVFrame
  pcm-bluray: decode directly to the user-provided AVFrame
  nellymoser: decode directly to the user-provided AVFrame
  mpc7/8: decode directly to the user-provided AVFrame
  mpegaudio: decode directly to the user-provided AVFrame
  mlp/truehd: decode directly to the user-provided AVFrame

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

65da7007

Merge commit '' · afe30fe0

Michael Niedermayer authored Feb 13, 2013

* commit '86bfcfcf':
  mace: decode directly to the user-provided AVFrame
  libspeex: decode directly to the user-provided AVFrame
  libopus: decode directly to the user-provided AVFrame
  libopencore-amr: decode directly to the user-provided AVFrame
  libgsm: decode directly to the user-provided AVFrame

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

afe30fe0

Merge commit '' · 5459cf41

Michael Niedermayer authored Feb 13, 2013

* commit 'a8ea936a':
  libilbc: decode directly to the user-provided AVFrame
  dpcm: decode directly to the user-provided AVFrame
  imc/iac: decode directly to the user-provided AVFrame
  gsm: decode directly to the user-provided AVFrame

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

5459cf41

Merge commit '' · d88e674a

Michael Niedermayer authored Feb 13, 2013

* commit 'cb7b47a6':
  g726: decode directly to the user-provided AVFrame
  g723.1: decode directly to the user-provided AVFrame
  g722: decode directly to the user-provided AVFrame
  flac: decode directly to the user-provided AVFrame
  cinaudio: decode directly to the user-provided AVFrame

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

d88e674a

Merge commit '' · 0a513869

Michael Niedermayer authored Feb 13, 2013

* commit '182821cf':
  dca: decode directly to the user-provided AVFrame
  cook: decode directly to the user-provided AVFrame
  comfortnoise: decode directly to the user-provided AVFrame
  bmvaudio: decode directly to the user-provided AVFrame
  pcm: decode directly to the user-provided AVFrame

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

0a513869

Merge commit '' · f03cdbd0

Michael Niedermayer authored Feb 13, 2013

* commit '5cc0bd2c':
  binkaudio: decode directly to the user-provided AVFrame
  atrac3: decode directly to the user-provided AVFrame
  atrac1: decode directly to the user-provided AVFrame
  ape: decode directly to the user-provided AVFrame
  amrwb: decode directly to the user-provided AVFrame

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

f03cdbd0

Merge commit '' · d13f434d

Michael Niedermayer authored Feb 13, 2013

* commit 'e3db3429':
  amrnb: decode directly to the user-provided AVFrame
  als: decode directly to the user-provided AVFrame
  alac: decode directly to the user-provided AVFrame
  adxenc: alloc/free coded_frame instead of keeping it in the ADXContext
  adx: decode directly to the user-provided AVFrame

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

d13f434d

Merge commit '' · 4789955e

Michael Niedermayer authored Feb 13, 2013

* commit 'e57daa87':
  adpcm: decode directly to the user-provided AVFrame
  ac3: decode directly to the user-provided AVFrame
  aac: decode directly to the user-provided AVFrame
  8svx: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/8svx.c
	libavcodec/ac3dec.c
	libavcodec/adpcm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

4789955e

doc/demuxers: quote command line arguments with @code · 2acd5fb5
Daniel Verkamp authored Feb 12, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
2acd5fb5

shorten: dont leave invalid channel counts in the context. · 4f127915

Michael Niedermayer authored Feb 13, 2013

Fixes freeing invalid addresses

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

4f127915

12 Feb, 2013 10 commits
- tiff: Check buffer allocation and pointer increment more carefully in shorts2str() and double2str() · e1219cda
  Michael Niedermayer authored Feb 12, 2013
```
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  e1219cda
- faxcompr: Dont read ref when the end has been reached in pass mode · 6f9ae391
  Michael Niedermayer authored Feb 12, 2013
```
Fixes reading over the end

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  6f9ae391
- pngdec/filter: dont access out of array elements at the end · 1ac0fa50
  Michael Niedermayer authored Feb 12, 2013
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  1ac0fa50
- lavr: fix mixing matrix reduction when normalization is disabled · 157542eb
  Justin Ruggles authored Jan 27, 2013
```
In some cases when an input contributes fully to the corresponding
output, other inputs may also contribute to the same output. This is the
case, for example, for the default 5.1 to stereo downmix matrix without
normalization.
```
  157542eb
- lavr: fix matrix reduction for upmixing in certain cases · 600b4c97
  Justin Ruggles authored Jan 18, 2013
```
Do not skip an output if the corresponding input contributes to other output
channels.
```
  600b4c97
- lavr: cosmetics: reindent · a3735bb9
  Justin Ruggles authored Jan 18, 2013
  
  a3735bb9
- lavr: make sure that the mix function is reset even if no mixing will be done · 1647da89
  Justin Ruggles authored Jan 18, 2013
```
If the matrix reduction ends up with no mixing matrix needed, we need to still
reset the mix function accordingly and log the info to the user.
```
  1647da89
- lavr: print out the mix matrix in ff_audio_mix_set_matrix() · 646831e6
  Justin Ruggles authored Jan 18, 2013
```
This will print the new matrix if it is set after initialization.
```
  646831e6
- wmaenc: alloc/free coded_frame instead of keeping it in the WMACodecContext · 205a95f7
  Justin Ruggles authored Dec 24, 2012
  
  205a95f7
- ws-snd1: decode directly to the user-provided AVFrame · 8ae50d87
  Justin Ruggles authored Dec 24, 2012
  
  8ae50d87