Commits · 61301ca7860fb044995c71a0cd432cb3d833eb3b · Linshizhi / ffmpeg.wasm-core

28 May, 2014 9 commits

Michael Niedermayer authored May 28, 2014

* commit '54ed488b':
  flac muxer: write WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag for multichannel files

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

61301ca7

Merge commit '' · 03ffaed3

Michael Niedermayer authored May 28, 2014

* commit 'd6b9ce99':
  flac demuxer: parse the WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag
Merged-by: Michael Niedermayer <michaelni@gmx.at>

03ffaed3

Merge commit '' · ef13967e

Michael Niedermayer authored May 28, 2014

* commit 'f13ffb66':
  flacdec: do not overwrite a channel layout set by the caller
Merged-by: Michael Niedermayer <michaelni@gmx.at>

ef13967e

flac muxer: write WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag for multichannel files · 54ed488b
Anton Khirnov authored May 25, 2014

54ed488b
flac demuxer: parse the WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag · d6b9ce99
Anton Khirnov authored May 25, 2014
```
It is used to store the channel mask for non-standard layouts.
```
d6b9ce99

flacdec: do not overwrite a channel layout set by the caller · f13ffb66

Anton Khirnov authored May 25, 2014

The channel layout mask for non-standard layouts is typically stored at
the container level (as a vorbiscomment tag) for FLAC.

f13ffb66

ffmpeg: add -devices param · 8518da23

Lukasz Marek authored May 27, 2014

FFmpeg mix devices and file formats when -formats option is used.
This commit adds a -devices param to list devices only.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

8518da23

libavformat/utils: Fix segfault on m4a cover artwork parsing · bbc10a1a
Lazaros Koromilas authored May 27, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
bbc10a1a
Timecode: Support 48fps · 12875df3
Thierry Foucu authored May 27, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
12875df3

27 May, 2014 31 commits
- avformat/oggenc: fix EOS flag · 919c320f
  Michael Niedermayer authored May 27, 2014
```
This corrects the bug that caused the checksums to change in
9767d7c0Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  919c320f
- Merge commit '9767d7c0' · b5657516
  Michael Niedermayer authored May 27, 2014
```
* commit '9767d7c0':
  oggenc: Flush after writing headers

Conflicts:
	tests/ref/lavf/ogg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  b5657516
- Merge commit '1d3eb0b5' · 5313d60d
  Michael Niedermayer authored May 27, 2014
```
* commit '1d3eb0b5':
  oggenc: Move ogg_write_pages up above ogg_write_header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  5313d60d
- Merge commit '512f3ffe' · 48a69163
  Michael Niedermayer authored May 27, 2014
```
* commit '512f3ffe':
  dsputil: Split off HuffYUV encoding bits into their own context

Conflicts:
	configure
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/huffyuv.h
	libavcodec/huffyuvenc.c
	libavcodec/pngenc.c
	libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  48a69163
- Merge commit '0d439fbe' · e2abc0d5
  Michael Niedermayer authored May 27, 2014
```
* commit '0d439fbe':
  dsputil: Split off HuffYUV decoding bits into their own context

Conflicts:
	configure
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/huffyuv.h
	libavcodec/huffyuvdec.c
	libavcodec/lagarith.c
	libavcodec/vble.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil.asm
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  e2abc0d5
- Merge commit '888dcd86' · 43c57dbe
  Michael Niedermayer authored May 27, 2014
```
* commit '888dcd86':
  h264_picture: Remove pointless dsputil.h #include
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  43c57dbe
- Merge commit 'f1df0a4c' · d84286b1
  Michael Niedermayer authored May 27, 2014
```
* commit 'f1df0a4c':
  on2avc: Remove pointless dsputil.h #include
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  d84286b1
- avformat/rtspdec: Use av_mallocz_array() · 5be8c276
  Michael Niedermayer authored May 27, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  5be8c276
- avcodec/vp3: use av_mallocz_array() · 28706178
  Michael Niedermayer authored May 27, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  28706178
- avcodec/cavs: use av_mallocz_array() · 0674da99
  Michael Niedermayer authored May 27, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  0674da99
- doc/filters: amix only supports float samples · 8a64ea76
  Lou Logan authored May 26, 2014
```
Signed-off-by: Lou Logan <lou@lrcd.com>
```
  8a64ea76
- oggenc: Flush after writing headers · 9767d7c0
  Andrew Kelley authored May 26, 2014
```
Before, header information for ogg format files was sent with the
first encoded packet.

This patch makes it so that it is possible for API users to
differentiate between headers and encoded audio. This is useful, for
example, when creating an audio stream where you want to send one set
of headers for every client that connects and then the encoded stream
of audio.
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  9767d7c0
- oggenc: Move ogg_write_pages up above ogg_write_header · 1d3eb0b5
  Andrew Kelley authored May 26, 2014
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  1d3eb0b5
- avfilter/formats: Avoid using non public AV_SAMPLE_FMT_NB · 1853e2cb
  Michael Niedermayer authored May 27, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  1853e2cb
- dsputil: Split off HuffYUV encoding bits into their own context · 512f3ffe
  Diego Biurrun authored Dec 23, 2013
```
Also shorten HuffYUV context member names to avoid clutter.
```
  512f3ffe
- dsputil: Split off HuffYUV decoding bits into their own context · 0d439fbe
  Diego Biurrun authored Jan 07, 2014
```
Also shorten HuffYUV context member names to avoid clutter.
```
  0d439fbe
- avfilter/vf_drawtext: Avoid using non public AV_PIX_FMT_NB · 0d26264f
  Michael Niedermayer authored May 27, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  0d26264f
- avfilter/vf_telecine: Avoid using non public AV_PIX_FMT_NB · ee0c91cc
  Michael Niedermayer authored May 27, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  ee0c91cc
- avfilter/vf_transpose: Avoid using non public AV_PIX_FMT_NB · 515e8aed
  Michael Niedermayer authored May 27, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  515e8aed
- avfilter/vf_swapuv: Avoid using non public AV_PIX_FMT_NB · e10ac3a1
  Michael Niedermayer authored May 27, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  e10ac3a1
- avfilter/vf_noise: Avoid using non public AV_PIX_FMT_NB · cfa0ad6e
  Michael Niedermayer authored May 27, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  cfa0ad6e
- avfilter/vf_mergeplanes: Avoid using non public AV_PIX_FMT_NB · 1dbc9846
  Michael Niedermayer authored May 27, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  1dbc9846
- avfilter/il: Avoid using non public AV_PIX_FMT_NB · c0f8801e
  Michael Niedermayer authored May 27, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  c0f8801e
- avfilter/hflip: Avoid using non public AV_PIX_FMT_NB · 5feac96f
  Michael Niedermayer authored May 27, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  5feac96f
- avfilter/crop: Avoid using non public AV_PIX_FMT_NB · f3fdc32e
  Michael Niedermayer authored May 27, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  f3fdc32e
- avfilter/formats: Avoid using non public AV_PIX_FMT_NB · 64fb19cc
  Michael Niedermayer authored May 27, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  64fb19cc
- Improve the detection of architecture x86. · 0f17bc64
  Andreas Cadhalpun authored May 26, 2014
```
This fixes building on Debian GNU/Hurd.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  0f17bc64
- x86/dsputilenc: use HADDD in ff_sse16_sse2 · 58632070
  James Almer authored May 27, 2014
```
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  58632070
- h264_picture: Remove pointless dsputil.h #include · 888dcd86
  Diego Biurrun authored May 23, 2014
  
  888dcd86
- on2avc: Remove pointless dsputil.h #include · f1df0a4c
  Diego Biurrun authored May 23, 2014
  
  f1df0a4c
- x86/dsputilenc: implement SSE2 version of diff_pixels · e64e079e
  James Almer authored May 26, 2014
```
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  e64e079e