Commits · 80a3a6611fe5866163b2e64da7c492fff7874a03 · Linshizhi / ffmpeg.wasm-core

29 Jul, 2014 12 commits

Michael Niedermayer authored Jul 29, 2014

* commit '3a19405d':
  avformat: Use the mime type information in input probe

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

80a3a661

Merge commit '' · 31e0b5d3

Michael Niedermayer authored Jul 29, 2014

* commit '69e7336b':
  avstring: Expose the simple name match function

Conflicts:
	libavutil/avstring.c
	libavutil/avstring.h
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

31e0b5d3

Merge commit '' · e066f015

Michael Niedermayer authored Jul 29, 2014

* commit 'e253a9e2':
  avformat: Move av_probe_input* to format.c

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

e066f015

avformat: Use the mime type information in input probe · 3a19405d
Luca Barbato authored Mar 13, 2014
```
It should provide a quicker guess for elementary streams provided
by http.
```
3a19405d
avstring: Expose the simple name match function · 69e7336b
Luca Barbato authored Jul 29, 2014
```
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
```
69e7336b
avformat/hlsenc: fix cleanup after avformat_write_header() · 0c889da8
Nicolas Martyanoff authored Jul 29, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
0c889da8
avformat: Move av_probe_input* to format.c · e253a9e2
Luca Barbato authored Mar 13, 2014

e253a9e2

x86/hevc_deblock: add add ff_hevc_[hv]_loop_filter_luma_{8, 10, 12}_avx · 73c4f63b

James Almer authored Jul 29, 2014

~5% faster than SSSE3
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

73c4f63b

x86/hevc_deblock: improve luma functions register allocation · 88ba821f
James Almer authored Jul 29, 2014
```
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
88ba821f

x86/hevc_deblock: remove some unnecessary instructions · c74b08c5

James Almer authored Jul 29, 2014

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

c74b08c5

hevc_filter: run vertical and horizontal together · 65746bfb

Christophe Gisquet authored Jul 26, 2014

This should help cache locality. On win64:
Before: 1397x cycles, 16216 bytes
After:  1369x cycles, 16040 bytes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

65746bfb

x86/hevc_deblock: use psignw instead of pmullw where possible · 4f91bb0f

James Almer authored Jul 29, 2014

It's slightly faster
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

4f91bb0f

28 Jul, 2014 28 commits

Merge commit '' · 983109bb

Michael Niedermayer authored Jul 28, 2014

* commit '942269fd':
  caf: Use correct printf conversion specifiers for POSIX int types

Conflicts:
	libavformat/cafdec.c

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

983109bb

Merge commit '' · d55d8229

Michael Niedermayer authored Jul 28, 2014

* commit '019a28cd':
  sanm: Use correct printf conversion specifiers for POSIX int types
Merged-by: Michael Niedermayer <michaelni@gmx.at>

d55d8229

Merge commit '' · 60831f44

Michael Niedermayer authored Jul 28, 2014

* commit '59ca29a5':
  dump: Use correct printf conversion specifiers for POSIX int types
Merged-by: Michael Niedermayer <michaelni@gmx.at>

60831f44

Merge commit '' · a91c5ed0

Michael Niedermayer authored Jul 28, 2014

* commit '4f8cf0dc':
  x86: build: Restore ordering of OBJS lines

Conflicts:
	libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>

a91c5ed0

Merge commit '' · 621d4089

Michael Niedermayer authored Jul 28, 2014

* commit 'e4a462e3':
  configure: Use require_pkg_config for Speex

Conflicts:
	configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>

621d4089

Merge commit '' · 8b1e9206

Michael Niedermayer authored Jul 28, 2014

* commit '259fe728':
  mxf: Extract origin information from material and source track
Merged-by: Michael Niedermayer <michaelni@gmx.at>

8b1e9206

Merge commit '' · 4a4d0258

Michael Niedermayer authored Jul 28, 2014

* commit 'c9d982aa':
  mxf: Detect Vanc/Vbi SMPTE-436M mxf track
Merged-by: Michael Niedermayer <michaelni@gmx.at>

4a4d0258

Merge commit '' · 25a20608

Michael Niedermayer authored Jul 28, 2014

* commit 'dc71f195':
  video4linux2: Avoid a floating point exception
Merged-by: Michael Niedermayer <michaelni@gmx.at>

25a20608

Fix standalone compilation of the adts muxer. · 63c0b419
Carl Eugen Hoyos authored Jul 28, 2014

63c0b419
caf: Use correct printf conversion specifiers for POSIX int types · 942269fd
Diego Biurrun authored Jul 28, 2014

942269fd
sanm: Use correct printf conversion specifiers for POSIX int types · 019a28cd
Diego Biurrun authored Jul 26, 2014

019a28cd
dump: Use correct printf conversion specifiers for POSIX int types · 59ca29a5
Diego Biurrun authored Jul 26, 2014

59ca29a5
x86: build: Restore ordering of OBJS lines · 4f8cf0dc
Diego Biurrun authored Jul 26, 2014

4f8cf0dc

configure: Use require_pkg_config for Speex · e4a462e3

Luca Barbato authored Jul 24, 2014

Distributors and integrators nowadays have less problems by leveraging
pkg-config files than having to set custom CFLAGS and LDFLAGS.

e4a462e3

mxf: Extract origin information from material and source track · 259fe728
Marc-Antoine Arnaud authored Jul 22, 2014
```
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
259fe728
mxf: Detect Vanc/Vbi SMPTE-436M mxf track · c9d982aa
Marc-Antoine Arnaud authored Jul 22, 2014
```
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
c9d982aa
video4linux2: Avoid a floating point exception · dc71f195
Bernhard Übelacker authored Jul 27, 2014
```
This avoids a segfault in avconv_opt.c:opt_target when trying to
determine the norm.
```
dc71f195

x86/hevc_deblock: load less data in hevc_h_loop_filter_luma_8 · 664e9e43

James Almer authored Jul 28, 2014

Reading 8 bytes is enough.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

664e9e43

x86/hevc_idct: add a colon to labels · f1378761

James Almer authored Jul 28, 2014

This fixes a warning spam when using NASM
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

f1378761

avdevice/pulse_audio_enc: use getter function for AVFrame.channels · 1e51af13
Michael Niedermayer authored Jul 28, 2014
```
This is required by the API/ABI for things outside libavutil
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
1e51af13

tests/fate.sh: If cat *.rep fails try it with a for loop. · d554d004

Michael Niedermayer authored Jul 28, 2014

Fixes fate on haiku, where cat dies due to too many arguments
xargs could be used too but we do not use xargs currently so it
would be an additional dependency.

Also the plain cat is left in place as it is faster than the loop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

d554d004

version.sh: Print versions based on the last git tag for release branches · f3158c3f

Michael Niedermayer authored Jul 28, 2014

release branches are detected by checking if "git" is not in RELEASE
This changes "N-64706-g2f71aeb" to "n2.3-8-g2f71aeb"
for git master theres no change

This should improve the readability of lists of versions which come from
more than 1 release branch or master + release. fate.ffmpeg.org is
one possible example
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ee606fd0317df202b59946cf9b738c0a01056316)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

f3158c3f

avcodec/hevc: fix "discards const qualifier from pointer target type" warning · 243236a6
Michael Niedermayer authored Jul 28, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
243236a6
avcodec/hevc: add some const to cbf arrays · 772dfd5f
Michael Niedermayer authored Jul 28, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
772dfd5f

hevc: clean up non relevant TODO · 42ffa226

Mickaël Raulet authored Jul 27, 2014

cherry picked from commit a2ef95f043d89d05482af19460c9e9afdadec685
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

42ffa226

hevc: rename variable in boundary strength to b more explicit · a5c621aa

Anton Khirnov authored Jul 27, 2014

Signed-off-by: Mickaël Raulet <mraulet@insa-rennes.fr>

cherry picked from commit 348bebedc0012aae201419669fca1eb61ec93ca6
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

a5c621aa

Merge commit '' · e0492311

Michael Niedermayer authored Jul 28, 2014

* commit 'e76f2d11':
  hevc: eliminate the last element from TransformTree

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

e0492311

Merge commit '' · 4a73fa19

Michael Niedermayer authored Jul 28, 2014

* commit '4aa80808':
  hevc: eliminate unnecessary cbf_c{b,r} arrays

Conflicts:
	libavcodec/hevc.c

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

4a73fa19