Commits · 48a691630833d6b12905475b6bf39fef285872a9 · Linshizhi / ffmpeg.wasm-core

27 May, 2014 34 commits
- 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
- 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
- avcodec/x86/dsputilenc: set the count of SSE registers correctly for get_pixels · a0c5cd34
  Michael Niedermayer authored May 27, 2014
```
Found-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  a0c5cd34
- Merge commit '7cc4c9f3' · a1cb4efd
  Michael Niedermayer authored May 27, 2014
```
* commit '7cc4c9f3':
  lavfi/formats: avoid using AV_{PIX,SAMPLE}_FMT_NB
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  a1cb4efd
- Merge commit 'b03b2d86' · 50ffd843
  Michael Niedermayer authored May 27, 2014
```
* commit 'b03b2d86':
  buffersrc: avoid using AV_PIX_FMT_NB

Conflicts:
	libavfilter/buffersrc.c

No change as AV_PIX_FMT_NB was not used by our buffersrc.c
See: 0d58bbb2Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  50ffd843
- Merge commit 'a7d070ac' · cdf6a944
  Michael Niedermayer authored May 27, 2014
```
* commit 'a7d070ac':
  vf_fieldorder: avoid using AV_PIX_FMT_NB
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  cdf6a944
- Merge commit '862f33c1' · de5ec088
  Michael Niedermayer authored May 27, 2014
```
* commit '862f33c1':
  vf_scale: use the pixfmt descriptor API

Conflicts:
	libavfilter/vf_scale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  de5ec088
- avfilter/vf_format: fix duplicate ; · a37f2cc5
  Michael Niedermayer authored May 27, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  a37f2cc5
- Merge commit '45fc73ed' · 6e9dbee7
  Michael Niedermayer authored May 27, 2014
```
* commit '45fc73ed':
  vf_format: rework format list parsing

Conflicts:
	libavfilter/vf_format.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  6e9dbee7
- Merge commit '4d8c28de' · e222cfef
  Michael Niedermayer authored May 27, 2014
```
* commit '4d8c28de':
  imgutils: make systematic palette opaque.

Conflicts:
	libavutil/imgutils.c

See: 4d8c28deMerged-by: Michael Niedermayer <michaelni@gmx.at>
```
  e222cfef
26 May, 2014 6 commits

avformat/utils: set max analyze duration depending on the circumstances · e6a08464
Michael Niedermayer authored May 26, 2014
```
Fixes Ticket3673
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
e6a08464
avformat: move default for max_analyze_duration into utils.c · 52887aa4
Michael Niedermayer authored May 26, 2014
```
this way we can do better tha a single fixed constant value
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
52887aa4

lavfi/formats: avoid using AV_{PIX,SAMPLE}_FMT_NB · 7cc4c9f3

Anton Khirnov authored May 24, 2014

Thatt hardcodes the number of formats into lavfi and will break when a
shared lavu is updated, adding new formats.

7cc4c9f3

buffersrc: avoid using AV_PIX_FMT_NB · b03b2d86

Anton Khirnov authored May 24, 2014

That hardcodes the number of pixel formats into lavfi and will break
when a shared lavu is updated, adding new pixel formats.

b03b2d86

vf_fieldorder: avoid using AV_PIX_FMT_NB · a7d070ac

Anton Khirnov authored May 24, 2014

That hardcodes the number of pixel formats into lavfi and will break
when a shared lavu is updated, adding new pixel formats.

a7d070ac

vf_scale: use the pixfmt descriptor API · 862f33c1

Anton Khirnov authored May 24, 2014

Avoid using AV_PIX_FMT_NB, since that hardcodes the number of pixel
formats into lavfi and will break when a shared lavu is updated, adding
new pixel formats.

862f33c1