Commits · 23c1db9b83b5928a312b8d7cd753d04d49c252b6 · Linshizhi / ffmpeg.wasm-core

28 Sep, 2011 1 commit

Merge remote-tracking branch 'qatar/master' · 23c1db9b

Michael Niedermayer authored Sep 27, 2011

* qatar/master:
  avconv: use different variables for decoded and filtered frame.
  avconv: add support for copying attachments.
  matroskaenc: write attachments.
  matroskadec: export mimetype of attachments as metadata.
  avconv: factorize common code from new_*_stream()
  doc/avconv: expand documentation for some options.
  doc/avconv: document -timelimit.

Conflicts:
	avconv.c
	cmdutils.c
	tests/codec-regression.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>

23c1db9b

27 Sep, 2011 39 commits
- Prevent out of bound accesses in the xan decoder. · feca3ba0
  Laurent Aimar authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  feca3ba0
- Check for invalid/corrupted bitstream in sun raster decoder. · b9596a50
  Laurent Aimar authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  b9596a50
- Prevent NULL dereferences when missing the reference frame in the xan decoder. · 19e95b88
  Laurent Aimar authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  19e95b88
- Check for out of bounds reads in sun rasterfile decoder. · 039f3c33
  Laurent Aimar authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  039f3c33
- Check for corrupted extra data in wmavoice decoder. · 61930119
  Laurent Aimar authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  61930119
- Check for out of bound writes in the wmavoice decoder. · e09ae22a
  Laurent Aimar authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  e09ae22a
- Prevent NULL dereferences when missing the reference frame in the bink decoder. · 66aae97a
  Laurent Aimar authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  66aae97a
- mxf: Add PictureEssenceCoding UL for V210 · a1cb09d3
  Tomas Härdin authored Sep 26, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  a1cb09d3
- ffplay.texi: document -codec · 36be0f2e
  Michael Niedermayer authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  36be0f2e
- ffplay: support -codec:avs to force a specific decoder implementation · 5eda0967
  Michael Niedermayer authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  5eda0967
- regression tests: add jpeg2000 · 07a96dc1
  Michael Niedermayer authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  07a96dc1
- j2kenc: Fix use of value before its initialized. · 2fbf6910
  Michael Niedermayer authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  2fbf6910
- j2kenc: only list pixel formats that fully work currently. · 398b5327
  Michael Niedermayer authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  398b5327
- j2kenc: fix colors on yuv444 · 2214a67d
  Michael Niedermayer authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  2214a67d
- img2enc: show first 4 bytes if a malformed jpeg2000 codestream is detected · 9e0438c9
  Michael Niedermayer authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  9e0438c9
- img2enc: Accept raw jpeg2000 codestream too, · 0047ac14
  Michael Niedermayer authored Sep 27, 2011
```
 our decoder outputs that, jasper can as well
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  0047ac14
- RELEASE: set to 0.8.4.git after the release from 2011-09-22 · bfea1600
  Dominique Leuenberger authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  bfea1600
- j2kenc: enable 4:2:0 YUV it works as "well" as the other subsampled yuv formats · 34ac8ec2
  Michael Niedermayer authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  34ac8ec2
- build system: enable j2kenc · c4b269c5
  Michael Niedermayer authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  c4b269c5
- j2kenc: fix coded_frame and prevent null pointer dereference. · e6aed5f4
  Michael Niedermayer authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  e6aed5f4
- j2kenc: Update ff_j2k_init_component() arguments · 40923e15
  Michael Niedermayer authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  40923e15
- j2kenc: fix arguments for ff_j2k_getnbctxno() · 2f16b6a5
  Michael Niedermayer authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  2f16b6a5
- j2kenc: mark as experimental. · 0db973e0
  Michael Niedermayer authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  0db973e0
- j2kenc: s/CODEC_TYPE_VIDEO/AVMEDIA_TYPE_VIDEO/ · 1c20a0b3
  Michael Niedermayer authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  1c20a0b3
- j2kenc: update codec name to modern ffmpeg · de89bc99
  Michael Niedermayer authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  de89bc99
- j2kenc: cleanup() is not used outside thus it is static · 1e086fd7
  Michael Niedermayer authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  1e086fd7
- j2kenc: update function name. · c153c003
  Michael Niedermayer authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  c153c003
- avconv: use different variables for decoded and filtered frame. · d3c1d37a
  Anton Khirnov authored Sep 23, 2011
```
Makes the code less obfuscated and fixes encoding one video stream to
several outputs.

Also use avcodec_alloc_frame() instead of allocating AVFrame on stack.

Breaks me_threshold in avconv, as motion vectors aren't passed through
lavfi. They could be copied manually, but I don't think this misfeature
is useful enough to justify ugly hacks.
```
  d3c1d37a
- avconv: add support for copying attachments. · 3ccd1580
  Anton Khirnov authored Sep 27, 2011
  
  3ccd1580
- matroskaenc: write attachments. · c7a63a52
  Anton Khirnov authored Jul 30, 2011
  
  c7a63a52
- matroskadec: export mimetype of attachments as metadata. · 98cfe22b
  Anton Khirnov authored Sep 27, 2011
  
  98cfe22b
- avconv: factorize common code from new_*_stream() · becdce99
  Anton Khirnov authored Sep 27, 2011
  
  becdce99
- doc/avconv: expand documentation for some options. · d159060a
  Anton Khirnov authored Sep 12, 2011
  
  d159060a
- doc/avconv: document -timelimit. · 5aa3fcec
  Anton Khirnov authored Sep 12, 2011
  
  5aa3fcec
- mxfdec: Consider QuantizationBits between 17 and 24 to be pcm_s24* · 3e48dcea
  Tomas Härdin authored Sep 27, 2011
```
This fixes playback of BRD38772509.mxf
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  3e48dcea
- Check for out of bound writes when building tree in bink decoder. · 254af56d
  Laurent Aimar authored Sep 26, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  254af56d
- Check for various out of bound writes in the bink decoder. · 36bf135d
  Laurent Aimar authored Sep 26, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  36bf135d
- swfdec: return correct error code at EOF · 99d7d151
  Tanami, Ohad authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  99d7d151
- ffmpeg: fix typo in warning · 6c0a902d
  Lars Täuber authored Sep 27, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  6c0a902d