Commits · cf05fe8a7e588c005b93948e2e418a7b4744fe79 · Linshizhi / ffmpeg.wasm-core

28 May, 2013 7 commits

jpeg2000dwt: remove floats from mixed float/int 9/7 dwt · cf05fe8a
Michael Niedermayer authored May 28, 2013
```
This should fix some fate failures
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
cf05fe8a

Merge remote-tracking branch 'qatar/master' · 3fc85004

Michael Niedermayer authored May 28, 2013

* qatar/master:
  smacker: add a clarification notice about audio decoding
  configure: make jack depend on pthreads

Conflicts:
	configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>

3fc85004

Merge commit '' · 2ad28840

Michael Niedermayer authored May 28, 2013

* commit '538bf767':
  avconv: make -aspect work with streamcopy

Conflicts:
	ffmpeg.c
	ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2ad28840

Merge commit '' · 91db8ff2

Michael Niedermayer authored May 28, 2013

* commit '564b7e0c':
  matroskadec: silently skip CodecState element.
  smacker: fix off-by-one error in palette expanding code

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

91db8ff2

Merge commit '5f30c6c8' · 97f7586c
Michael Niedermayer authored May 28, 2013
```
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
97f7586c
smacker: add a clarification notice about audio decoding · 268bb885
Kostya Shishkov authored May 27, 2013

268bb885
j2kenc: Zero DWT struct on allocation · 9c66da51
Michael Niedermayer authored May 28, 2013
```
Should fix fate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
9c66da51

27 May, 2013 33 commits
- j2kdec: random non functional changed from jpeg2000 · 05fa3f68
  Michael Niedermayer authored May 27, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  05fa3f68
- j2kdec: merge get_tlm() from jpeg2000 · d66de380
  Michael Niedermayer authored May 27, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  d66de380
- j2k/jpeg2000: merge lowres code · 8cf57efd
  Michael Niedermayer authored May 27, 2013
```
This also fixes lowres use with ffplay
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  8cf57efd
- ffplay: dont forget passing lowres to private options · 840ee5e1
  Michael Niedermayer authored May 27, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  840ee5e1
- jpeg2000: merge mant type from j2k · f82e7330
  Michael Niedermayer authored May 27, 2013
```
mant fits in 16bit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  f82e7330
- configure: make jack depend on pthreads · a3fc62e8
  Anton Khirnov authored May 17, 2013
  
  a3fc62e8
- j2k/jpeg2000: merge j2k & jpeg2000 dwts, drop j2k dwt · d4a46613
  Michael Niedermayer authored May 27, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  d4a46613
- avconv: make -aspect work with streamcopy · 538bf767
  Anton Khirnov authored May 26, 2013
  
  538bf767
- matroskadec: silently skip CodecState element. · 564b7e0c
  Anton Khirnov authored May 15, 2013
```
mkvmerge apparrently uses it for mpeg1/2 video, but it contains the same
information as CodecPrivate, so it can be ignored.
```
  564b7e0c
- lavfi/haldclutsrc: 10l remove size options. · 160ea265
  Clément Bœsch authored May 27, 2013
  
  160ea265
- lavfi/overlay: remove do_blend forward declaration. · 92a2d12a
  Clément Bœsch authored May 27, 2013
  
  92a2d12a
- lavfi/lut3d: move lut3d init to its definition scope. · ae573824
  Clément Bœsch authored May 27, 2013
  
  ae573824
- lavfi: add haldclut filter. · 158d96e3
  Clément Bœsch authored May 24, 2013
```
Fixes Ticket #2517.
```
  158d96e3
- lavfi: add dual input helpers. · 43286028
  Clément Bœsch authored May 25, 2013
  
  43286028
- lavfi: add haldclutsrc filter. · 3cec29cf
  Clément Bœsch authored May 23, 2013
  
  3cec29cf
- j2k_dwt: fix scaling of 9/7 dwt · 1bbb46ff
  Michael Niedermayer authored May 27, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  1bbb46ff
- j2kenc: Allow encoding with the 9/7 wavelet · ee189701
  Michael Niedermayer authored May 27, 2013
```
Also add a fate test that tests 9/7
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  ee189701
- smacker: fix off-by-one error in palette expanding code · c3c08bae
  Kostya Shishkov authored May 27, 2013
  
  c3c08bae
- Revert "smackaud: clip output samples" · 5f30c6c8
  Kostya Shishkov authored May 27, 2013
```
Smacker audio uses overflows instead of clipping.

This reverts commit 375ca0ac.
```
  5f30c6c8
- j2k: change fixed point of stepsize to 16.16 · 243cc38d
  Michael Niedermayer authored May 27, 2013
```
This seems more natural and matches jpeg2000
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  243cc38d
- j2k/jpeg2000: Partially merge quantization code · 1b5cb6c0
  Michael Niedermayer authored May 27, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  1b5cb6c0
- j2k/jpeg2000: merge a few whitespaces · 9a18395b
  Michael Niedermayer authored May 27, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  9a18395b
- j2k: drop cblknx/y from Jpeg2000Band · c2e94209
  Michael Niedermayer authored May 27, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  c2e94209
- j2k/jpeg2000: drop xi/yi0/1 from Jpeg2000Prec · 8c2e201c
  Michael Niedermayer authored May 27, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  8c2e201c
- j2k: remove cblk from band · a05db52c
  Michael Niedermayer authored May 27, 2013
```
cblk is now in the same place as in jpeg2000, which will simplify
merging the 2 decoders
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  a05db52c
- j2kdec: merge decode_tile cblk handling from jpeg2000 · 81ccc31f
  Michael Niedermayer authored May 27, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  81ccc31f
- j2kdec: cdxy != 1 does not work, print an error · 2c5a5c5a
  Michael Niedermayer authored May 27, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  2c5a5c5a
- j2k/jpeg2000: restructure cblk coord · 14652c08
  Michael Niedermayer authored May 27, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  14652c08
- j2k: fix band coord · 5161c625
  Michael Niedermayer authored May 27, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  5161c625
- j2kdec: merge cblk restructuring from jpeg2000 · 369422db
  Michael Niedermayer authored May 27, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  369422db
- j2kenc: switch to cblk in prec · cbaa0871
  Michael Niedermayer authored May 27, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  cbaa0871
- j2k: merge precinct init code from jpeg2000 · 9fd23baa
  Michael Niedermayer authored May 26, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  9fd23baa
- j2k/jpeg2000 headers: Cblk/Prec cleanup & merge · 3300b5f6
  Michael Niedermayer authored May 26, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  3300b5f6