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

31 Mar, 2014 16 commits

Michael Niedermayer authored Mar 31, 2014

* commit 'c042cbc3':
  libx265: Use the repeat headers flag when not using global headers

See: 1b28d9b3Merged-by: Michael Niedermayer <michaelni@gmx.at>

4ea333d7

Merge commit '' · 4a6dce9f

Michael Niedermayer authored Mar 31, 2014

* commit 'cd606317':
  libx265: Bump version requirement

See: 32998ee9Merged-by: Michael Niedermayer <michaelni@gmx.at>

4a6dce9f

avcodec/mjpegdec: support subsampled 420 CMYK · 559c8b9e
Michael Niedermayer authored Mar 31, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
559c8b9e
avcodec/mjpegdec: upgrade upscale_v to support multiple planes · 79849081
Michael Niedermayer authored Mar 31, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
79849081
avcodec/mjpegdec: upgrade upscale_h to support multiple planes · f9059ce7
Michael Niedermayer authored Mar 31, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
f9059ce7

libx265: Use the repeat headers flag when not using global headers · c042cbc3

Marcus Gustafsson authored Mar 25, 2014

This allows proper muxing and seeking in things like MPEG-TS, by
placing headers by random access points.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

c042cbc3

libx265: Bump version requirement · cd606317

Derek Buitenhuis authored Mar 30, 2014

Build 13 has a crucial fix which makes x265_encode_headers work
as its always been documented.

Previous to this, the check was incorrect.

Also allows for use of the repeat headers flag.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

cd606317

libx265: Use the repeat headers flag when not using global headers · 1b28d9b3

Marcus Gustafsson authored Mar 25, 2014

This allows proper muxing and seeking in things like MPEG-TS, by
placing headers by random access points.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

1b28d9b3

libx265: Bump version requirement · 32998ee9

Derek Buitenhuis authored Mar 30, 2014

Build 13 has a crucial fix which makes x265_encode_headers work
as its always been documented.

Previous to this, the check was incorrect.

Also allows for use of the repeat headers flag.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

32998ee9

avcodec/adpcm: also squelch 'mismatch in coded sample count' warning for AV_CODEC_ID_ADPCM_EA_R1 · bf7d93e1

Peter Ross authored Mar 31, 2014

AV_CODEC_ID_ADPCM_EA_R1/R2/R3 all use an internal offset. For some
samples there is padding between the offset table and ADPCM data.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

bf7d93e1

configure: Remove invalid option --disable-qtkit. · a9ccec52

Thilo Borgmann authored Mar 31, 2014

QTKit can/should be disabled by "--disable-indev=qtkit".

Found by Justin Derrick.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

a9ccec52

avfilter/vf_pullup: fix gray8 · e818ee09

Michael Niedermayer authored Mar 31, 2014

Fixes segfault
Fixes Ticket3469
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

e818ee09

Merge remote-tracking branch 'qatar/master' · 75621cdf

Michael Niedermayer authored Mar 31, 2014

* qatar/master:
  libmp3lame: add ABR support

Conflicts:
	libavcodec/libmp3lame.c
	libavcodec/version.h

See: d3211cfaMerged-by: Michael Niedermayer <michaelni@gmx.at>

75621cdf

Merge commit '' · e4fc7e3d

Michael Niedermayer authored Mar 31, 2014

* commit '292dbe5e':
  libmp3lame: add comments about CBR/VBR modes

Conflicts:
	libavcodec/libmp3lame.c

See: 07e7bc9cMerged-by: Michael Niedermayer <michaelni@gmx.at>

e4fc7e3d

Merge commit '' · 801b94a7

Michael Niedermayer authored Mar 31, 2014

* commit '729d821f':
  libmp3lame: allow joint stereo to be disabled

Conflicts:
	libavcodec/libmp3lame.c
	libavcodec/version.h

See: 1de11a7cMerged-by: Michael Niedermayer <michaelni@gmx.at>

801b94a7

Merge commit '' · 46ff8108

Michael Niedermayer authored Mar 31, 2014

* commit '12789d96':
  mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd

Conflicts:
	libavformat/isom.c

See: e21235f9Merged-by: Michael Niedermayer <michaelni@gmx.at>

46ff8108

30 Mar, 2014 24 commits
- Merge commit 'fce28c3c' · 1ffbaa88
  Michael Niedermayer authored Mar 30, 2014
```
* commit 'fce28c3c':
  mov: fill in subtitle dimensions after parsing tkhd

See: 8ba432bcMerged-by: Michael Niedermayer <michaelni@gmx.at>
```
  1ffbaa88
- Merge commit '96138e8c' · 20bc5924
  Michael Niedermayer authored Mar 30, 2014
```
* commit '96138e8c':
  isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata()

Conflicts:
	libavformat/isom.c

See: b6ad5893Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  20bc5924
- Merge commit '9bd4a9f4' · 36d37edf
  Michael Niedermayer authored Mar 30, 2014
```
* commit '9bd4a9f4':
  isom: Simplify mov_rewrite_dvd_sub_extradata()

Conflicts:
	libavformat/isom.c

See: f6f3c85cMerged-by: Michael Niedermayer <michaelni@gmx.at>
```
  36d37edf
- Merge commit '3e4e2142' · 8e8276e0
  Michael Niedermayer authored Mar 30, 2014
```
* commit '3e4e2142':
  fate: Convert the paletted output in the brenderpix tests to rgb24
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  8e8276e0
- libmp3lame: add ABR support · 09fda6bb
  Timothy Gu authored Nov 02, 2013
  
  09fda6bb
- libmp3lame: add comments about CBR/VBR modes · 292dbe5e
  Timothy Gu authored Oct 24, 2013
  
  292dbe5e
- libmp3lame: allow joint stereo to be disabled · 729d821f
  Paul B Mahol authored Mar 30, 2013
  
  729d821f
- mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd · 12789d96
  Michael Niedermayer authored Mar 20, 2014
```
This also moves mov_rewrite_dvd_sub_extradata() to mov.c.

Sample-Id: NeroRecodeSample.mp4
```
  12789d96
- mov: fill in subtitle dimensions after parsing tkhd · fce28c3c
  Michael Niedermayer authored Mar 20, 2014
```
Sample-Id: NeroRecodeSample.mp4
```
  fce28c3c
- isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata() · 96138e8c
  Michael Niedermayer authored Mar 20, 2014
```
Sample-Id: NeroRecodeSample.mp4
```
  96138e8c
- isom: Simplify mov_rewrite_dvd_sub_extradata() · 9bd4a9f4
  Michael Niedermayer authored Mar 20, 2014
```
This avoids the 2nd buffer and fixes the palette truncated check
```
  9bd4a9f4
- fate: Convert the paletted output in the brenderpix tests to rgb24 · 3e4e2142
  Martin Storsjö authored Mar 30, 2014
```
This makes the output consistent on big-endian systems.
```
  3e4e2142
- Use intel compliant CDQ instead of CLTD in inline asm. · 0f2588d7
  Matt Oliver authored Mar 30, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  0f2588d7
- doc/indevs: Fix example for QTKit usage. · 6d9bdd9d
  Thilo Borgmann authored Mar 30, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  6d9bdd9d
- Merge remote-tracking branch 'qatar/master' · 9c77e573
  Michael Niedermayer authored Mar 30, 2014
```
* qatar/master:
  avconv: make the ASCII flow charts narrower to fit onto TTY

Conflicts:
	doc/ffmpeg.texi

See: 8fe10760Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  9c77e573
- Merge commit '68e95ab8' · f22d9b1e
  Michael Niedermayer authored Mar 30, 2014
```
* commit '68e95ab8':
  dnxhdenc: return meaningful return codes

Conflicts:
	libavcodec/dnxhdenc.c

See: b9bedb0bMerged-by: Michael Niedermayer <michaelni@gmx.at>
```
  f22d9b1e
- Merge commit '9e4e35b4' · ce0ec108
  Michael Niedermayer authored Mar 30, 2014
```
* commit '9e4e35b4':
  avconv_opt: fix avio_open2() return code check

See: 774239beMerged-by: Michael Niedermayer <michaelni@gmx.at>
```
  ce0ec108
- lavd: Add QTKit input device. · 234f0bcb
  Vadim Kalinsky authored Mar 24, 2014
```
Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  234f0bcb
- avconv: make the ASCII flow charts narrower to fit onto TTY · 3a5a9654
  Timothy Gu authored Feb 07, 2014
```
These charts in man page are currently destroyed.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
```
  3a5a9654
- avformat/wtvenc: advise user when H264 startcode is not present · 92d657b5
  Peter Ross authored Mar 30, 2014
```
Fixes ticket #3473.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  92d657b5
- avformat/mpegtsenc: move startcode validity check to ff_check_h264_startcode · e61973db
  Peter Ross authored Mar 30, 2014
```
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  e61973db
- avformat/avio: also set generic URL context options · 7aa3979b
  Michael Niedermayer authored Mar 30, 2014
```
This should have no effect currently as there are no such options yet.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  7aa3979b
- avutil/opt: dont crash on av_opt_set_dict() with NULL · d9a3501c
  Michael Niedermayer authored Mar 30, 2014
```
This allows calling the function without the need to check if the
dictionary contains any entries
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  d9a3501c
- dnxhdenc: return meaningful return codes · 68e95ab8
  Timothy Gu authored Mar 29, 2014
  
  68e95ab8