Commits · 39867f3e098ab304cd3bef0ace19d73617cdb817 · Linshizhi / ffmpeg.wasm-core

21 Jul, 2015 15 commits

avfilter/af_channelmap: Move ff_add_channel_layout() call to querry_format() · 39867f3e
Michael Niedermayer authored Jul 21, 2015
```
Avoids memleak if querry_formats is not called
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
39867f3e
avformat/async: Add missing else · f2d7409c
Michael Niedermayer authored Jul 21, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
f2d7409c

Michael Niedermayer authored Jul 21, 2015

* commit '219b39a7':
  parseutil: Use non ambiguous aliases for uhd

Conflicts:
	doc/ffmpeg.texi
	libavutil/parseutils.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

be0fd074

tests/checkasm/Makefile: Fix checkasm with SDL · 593731ef
Michael Niedermayer authored Jul 21, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
593731ef
fate: add test for async protocol · aee909ac
Zhang Rui authored Jul 21, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
aee909ac
avcodec/hapdec: log reason for failure when texture type doesn't match stream · 5d0616ce
Tom Butterworth authored Jul 21, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
5d0616ce

avcodec: loongson optimize xvid idct with mmi · b50910e9

周晓勇 authored Jul 21, 2015

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

b50910e9

avcodec: loongson move simple idct functions to a separate file · 21e2f030

周晓勇 authored Jul 21, 2015

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

21e2f030

aacenc: move the generation of ff_aac_pow34sf_tab[] · 331c1e74

Rostislav Pehlivanov authored Jul 17, 2015

This commit moves the generation of ff_aac_pow34sf_tab[] out of the
encoder and into the table generator. The original commit log for
this table in 2011 actually mentions that it should be moved outside
but this never happened.

This is the first commit which cleans up the encoder a little.
Reviewed-by: Claudio Freire <klaussfreire@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

331c1e74

parseutil: Use non ambiguous aliases for uhd · 219b39a7
Luca Barbato authored Jul 20, 2015
```
uhd1 and uhd2 would be ambigous.
```
219b39a7
MAINTAINERS: add myself as a maintainer for async protocol · cee7acfc
Zhang Rui authored Jul 21, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
cee7acfc
avcodec/hapdec: don't log texture format every frame, do it once per decode session · 6b96c70f
Tom Butterworth authored Jul 21, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
6b96c70f
libavcodec/hap: remove unused struct member · 440c26e9
Tom Butterworth authored Jul 21, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
440c26e9
libavcodec/hap: Name enums · d8488090
Tom Butterworth authored Jul 21, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
d8488090

avcodec/aacsbr: fix compilation with hardcoded tables · 651448a8

James Almer authored Jul 20, 2015

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

651448a8

20 Jul, 2015 25 commits

Merge commit '' · eca84946

Michael Niedermayer authored Jul 20, 2015

* commit '9ed6f9a1':
  arm: use a local label instead of the function symbol in ff_prefetch_arm

See: cab63025Merged-by: Michael Niedermayer <michael@niedermayer.cc>

eca84946

Merge commit '' · 5d5f8b29

Michael Niedermayer authored Jul 20, 2015

* commit 'f56d8d8d':
  h264: aarch64: intra prediction optimisations

Conflicts:
	libavcodec/h264pred.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

5d5f8b29

Merge commit '' · 495eee01

Michael Niedermayer authored Jul 20, 2015

* commit '40cf1bba':
  Deprecate avctx.coded_frame

Conflicts:
	ffmpeg.c
	libavcodec/a64multienc.c
	libavcodec/asvenc.c
	libavcodec/cljrenc.c
	libavcodec/dpxenc.c
	libavcodec/gif.c
	libavcodec/mpegvideo_enc.c
	libavcodec/nvenc.c
	libavcodec/proresenc_kostya.c
	libavcodec/pthread_frame.c
	libavcodec/rawenc.c
	libavcodec/sunrastenc.c
	libavcodec/tiffenc.c
	libavcodec/version.h
	libavcodec/xbmenc.c
	libavcodec/xwdenc.c
	libavdevice/v4l2.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

495eee01

avcodec/utils: Do not merge side data for encoders · 809780ca

Michael Niedermayer authored Jul 20, 2015

With side data now being added to every MPEG*/H26* video encoder
in the form of a quality scalar, software which simply stores
the pkt->data to get an ES stream would break.
This also as a side-effect makes the code faster
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

809780ca

Merge commit '' · e5bae39f

Michael Niedermayer authored Jul 20, 2015

* commit '5d3addb9':
  Add a quality factor packet side data

Conflicts:
	doc/APIchanges
	ffmpeg.c
	libavcodec/avcodec.h
	libavcodec/mpegvideo_enc.c
	libavcodec/version.h
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

e5bae39f

Merge commit '' · b1fad7ac

Michael Niedermayer authored Jul 20, 2015

* commit 'd6604b29':
  Gather all coded_frame allocations and free functions to a single place

Conflicts:
	libavcodec/a64multienc.c
	libavcodec/asvenc.c
	libavcodec/cljrenc.c
	libavcodec/dpxenc.c
	libavcodec/dvenc.c
	libavcodec/gif.c
	libavcodec/huffyuvenc.c
	libavcodec/jpeglsenc.c
	libavcodec/libopenjpegenc.c
	libavcodec/libtheoraenc.c
	libavcodec/libvpxenc.c
	libavcodec/mpegvideo_enc.c
	libavcodec/nvenc.c
	libavcodec/pngenc.c
	libavcodec/proresenc_kostya.c
	libavcodec/sunrastenc.c
	libavcodec/tiffenc.c
	libavcodec/utils.c
	libavcodec/utvideoenc.c
	libavcodec/v210enc.c
	libavcodec/v410enc.c
	libavcodec/xbmenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

b1fad7ac

arm: use a local label instead of the function symbol in ff_prefetch_arm · 9ed6f9a1

Janne Grunau authored Jul 20, 2015

Avoids a relocation which might end out of range for thumb2.
Reported-By: Ludovic Fauvet <etix@videolan.org>
Bug-Id: https://bugs.webkit.org/show_bug.cgi?id=137022
CC: libav-stable@libav.org

9ed6f9a1

h264: aarch64: intra prediction optimisations · f56d8d8d
Janne Grunau authored Jul 12, 2015

f56d8d8d

Merge commit '' · 439c9760

Michael Niedermayer authored Jul 20, 2015

* commit '91f9b657':
  flashsvenc: Keep coded_frame.key_frame a write-only variable
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

439c9760

Merge commit '' · 5cc3faf6

Michael Niedermayer authored Jul 20, 2015

* commit '75c1ed2e':
  ffv1enc: Use input frame to set SAR and interlacing

Conflicts:
	libavcodec/ffv1enc.c

No change as the removed coded_frame uses where not in the code anymore
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

5cc3faf6

Merge commit '' · b97e3e11

Michael Niedermayer authored Jul 20, 2015

* commit '10a9149d':
  ffv1enc: Keep coded_frame.key_frame a write-only variable

Conflicts:
	libavcodec/ffv1.h
	libavcodec/ffv1enc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

b97e3e11

Merge commit '' · 256430cf

Michael Niedermayer authored Jul 20, 2015

* commit 'efc618af':
  qtrleenc: Keep coded_frame.key_frame a write-only variable

Conflicts:
	libavcodec/qtrleenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

256430cf

Merge commit '' · bde7f5b1

Michael Niedermayer authored Jul 20, 2015

* commit 'f3b4a922':
  libtheoraenc: Keep coded_frame.key_frame a write-only variable
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

bde7f5b1

Merge commit '' · 96504b3f

Michael Niedermayer authored Jul 20, 2015

* commit 'd6006dd9':
  libvpxenc: Do not entangle coded_frame

Conflicts:
	libavcodec/libvpxenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

96504b3f

Merge commit '' · 70c648db

Michael Niedermayer authored Jul 20, 2015

* commit '7fc8d8a1':
  libxvid: Do not entangle coded_frame
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

70c648db

Merge commit '' · 033144c0

Michael Niedermayer authored Jul 20, 2015

* commit '56672aea':
  svq1enc: Do not entangle coded_frame

Conflicts:
	libavcodec/svq1enc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

033144c0

Merge commit '' · f2a581e2

Michael Niedermayer authored Jul 20, 2015

* commit '05fb4c9a':
  proresenc: Do not entangle coded_frame

Conflicts:
	libavcodec/proresenc_kostya.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

f2a581e2

Merge commit '' · a99f0ad1

Michael Niedermayer authored Jul 20, 2015

* commit '91767360':
  a64multienc: Do not entangle coded_frame

Conflicts:
	libavcodec/a64multienc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

a99f0ad1

Merge commit '' · 6497aab0

Michael Niedermayer authored Jul 20, 2015

* commit '95e2317e':
  roqvideoenc: Drop unneeded initialization

Conflicts:
	libavcodec/roqvideoenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

6497aab0

Merge commit '' · 16b68bd2

Michael Niedermayer authored Jul 20, 2015

* commit '1f171de8':
  mpegvideo_enc: Drop unnneded initialization
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

16b68bd2

libavcodec/qsvdec.c: missed MFXVideoDECODE_Close() call · 264ba3d8
Ivan Uskov authored Jul 20, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
264ba3d8

configure: check for erf() and copysign() · 736a3860

James Almer authored Jul 20, 2015

They are not available on some compilers.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

736a3860

x86/vf_ssim: add ff_ssim_4x4_line_xop · e3851169

James Almer authored Jul 20, 2015

~20% faster than ssse3. Also enabled for x86_32
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

e3851169

x86/vf_ssim: fix some instruction comments · e1778fb6

James Almer authored Jul 20, 2015

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

e1778fb6

Adding myself as maintainer for qsv* · fec0485c
Ivan Uskov authored Jul 17, 2015
```
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
```
fec0485c