Commits · f91126643a91c2d3f8d8e210c8facaf259951b03 · Linshizhi / ffmpeg.wasm-core

01 Jul, 2015 20 commits

lavu: add an API function to return the FFmpeg version string · f9112664

wm4 authored Jun 30, 2015

This returns something like "N-73264-gb54ac840". This is much more useful
than the individual library versions, of which there are too much and
which are very hard to map back to releases or git commits.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

f9112664

avformat/concatdec: copy stream metadata when using concat · db64af63
Vadim Belov authored Jul 01, 2015
```
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
db64af63
avformat/nutdec: Check ff_gen_search() for failure · 60ec3007
Michael Niedermayer authored Jul 01, 2015
```
Fixes assertion failure

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
60ec3007

avcodec/motion_est: Fix undefined shifts in cmp_inline() · 4eee685a

Michael Niedermayer authored Jul 01, 2015

Fixes: signal_sigsegv_35eac16_2762_cov_2704249783_missing_frames.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

4eee685a

avcodec/mpegvideo_enc: fix undefined shifts in ff_dct_quantize_c() · 0ea099ad

Michael Niedermayer authored Jul 01, 2015

Fixes: signal_sigsegv_35eac16_2762_cov_2704249783_missing_frames.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

0ea099ad

avcodec/motion_est_template: Fix undefined shifts in CHECK_MV_DIR() · 56fd4705

Michael Niedermayer authored Jul 01, 2015

Fixes: signal_sigsegv_2e64ee0_2762_cov_4170502227_missing_frames.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

56fd4705

avformat/matroskadec: Fix undefined shift in read_sint() · 2f8c8163

Michael Niedermayer authored Jul 01, 2015

Fixes: asan_heap-oob_17212bc_2243_cov_594210248_h264_TTA.mkv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

2f8c8163

ffmpeg_opt: Fix forcing fourccs · 8750aef3
Michael Niedermayer authored Jul 01, 2015
```
Fixes Ticket4682
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
8750aef3

avcodec/elsdec: Remove EOVERFLOW · dec72888

Michael Niedermayer authored Jul 01, 2015

EOVERFLOW is not available on all platforms
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

dec72888

Merge commit '' · 55a04a5d

Michael Niedermayer authored Jul 01, 2015

* commit 'a1e2caa9':
  mov: Log format rather than fourcc in stsd in trace mode

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

55a04a5d

Merge commit '' · 35c8dda5

Michael Niedermayer authored Jul 01, 2015

* commit '2eef75fd':
  mov: Adjust variable types to fix format warnings
Merged-by: Michael Niedermayer <michaelni@gmx.at>

35c8dda5

Merge commit '' · a8e137a3

Michael Niedermayer authored Jul 01, 2015

* commit 'df22e301':
  dump: Use the correct abs() version
Merged-by: Michael Niedermayer <michaelni@gmx.at>

a8e137a3

Merge commit '' · 9c010ba6

Michael Niedermayer authored Jul 01, 2015

* commit '0d449c81':
  lavfi: Add library identifier

Conflicts:
	libavfilter/version.h

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

9c010ba6

Merge commit '' · 818ff7ff

Michael Niedermayer authored Jul 01, 2015

* commit '0f87f9b4':
  lavd: Add library identifier

Conflicts:
	libavdevice/version.h

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

818ff7ff

Merge commit '' · 16dd0426

Michael Niedermayer authored Jul 01, 2015

* commit '3f872c9b':
  lavc: Add missing API guard to dtg_active_format option
Merged-by: Michael Niedermayer <michaelni@gmx.at>

16dd0426

Merge commit '' · 9e93e544

Michael Niedermayer authored Jul 01, 2015

* commit '4d1229da':
  g2meet: Add FATE tests for all three G2M variants
Merged-by: Michael Niedermayer <michaelni@gmx.at>

9e93e544

Merge commit '' · 68939f76

Michael Niedermayer authored Jul 01, 2015

* commit '08c2d8f0':
  Go2Meeting decoder

Conflicts:
	Changelog
	libavcodec/g2meet.c
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

68939f76

Merge commit '' · 39748896

Michael Niedermayer authored Jul 01, 2015

* commit 'e2bd03a1':
  fate: Avoid unnecessary pixel format conversions

Conflicts:
	tests/fate/image.mak
	tests/ref/fate/dds-ya
Merged-by: Michael Niedermayer <michaelni@gmx.at>

39748896

avcodec/aacsbr: Assert that bs_num_env is positive · 2e13a45b
Michael Niedermayer authored Jul 01, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
2e13a45b

avcodec/aacsbr: check that the element type matches before applying SBR · 79a98294

Michael Niedermayer authored Jul 01, 2015

Fixes out of array access
Fixes: signal_sigsegv_3670fc0_2818_cov_2307326154_moon.mux

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

79a98294

30 Jun, 2015 20 commits

mov: Log format rather than fourcc in stsd in trace mode · a1e2caa9
Vittorio Giovara authored Jun 30, 2015
```
This will fix remaining format warnings.
```
a1e2caa9
mov: Adjust variable types to fix format warnings · 2eef75fd
Vittorio Giovara authored Jun 30, 2015

2eef75fd

dump: Use the correct abs() version · df22e301

Vittorio Giovara authored Jun 30, 2015

Fix warning from clang "absolute value function 'abs' given an argument
of type 'long long' but has parameter of type 'int' which may cause
truncation of value [-Wabsolute-value]".

df22e301

lavfi: Add library identifier · 0d449c81
Vittorio Giovara authored Jun 30, 2015

0d449c81
lavd: Add library identifier · 0f87f9b4
Vittorio Giovara authored Jun 30, 2015

0f87f9b4
lavc: Add missing API guard to dtg_active_format option · 3f872c9b
Vittorio Giovara authored Jun 30, 2015

3f872c9b
g2meet: Add FATE tests for all three G2M variants · 4d1229da
Diego Biurrun authored Mar 31, 2015
```
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
4d1229da

Go2Meeting decoder · 08c2d8f0

Kostya Shishkov authored Apr 10, 2015

ELS and ePIC decoder courtesy of Maxim Poliakovski,
cleanup and integration by Diego Biurrun.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

08c2d8f0

ffmpeg: windows: respond to logoff and ctrl+break messages as well · 4ebb43f1
rogerdpack authored Jun 30, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
4ebb43f1

ffmpeg: only count got_output/errors in decode_error_stat · bd0f1412

Andreas Cadhalpun authored Jun 30, 2015

If threading is used, the first (thread_count - 1) packets are read
before any frame/error is returned. Counting this as successful decoding
is wrong, because it also happens when no single frame could be decoded.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

bd0f1412

ffmpeg: exit_on_error if decoding a packet failed · cd64ead8

Andreas Cadhalpun authored Jun 30, 2015

This is the second part of the fix for ticket #4370.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

cd64ead8

pthread_frame: forward error codes when flushing · 32a5b631

Andreas Cadhalpun authored Jun 30, 2015

This is the first part of the fix for ticket #4370.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

32a5b631

avcodec/h264: Greenmetadata SEI parsing · 04a68f43
Nicolas DEROUINEAU authored Jun 30, 2015
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
04a68f43

Merge commit '' · 7e9c7b62

Michael Niedermayer authored Jun 30, 2015

* commit '271ce76d':
  h264: Parse registered data SEI message and AFD value

Conflicts:
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_sei.c
	libavcodec/version.h

See: d6e95669
See: 22291c37Merged-by: Michael Niedermayer <michaelni@gmx.at>

7e9c7b62

Merge commit '' · 8e6c5c43

Michael Niedermayer authored Jun 30, 2015

* commit '0bfab80a':
  h264_sei: Group error check outside the switch block

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

8e6c5c43

Merge commit '' · 2a227fe8

Michael Niedermayer authored Jun 30, 2015

* commit '0a49a62f':
  h263: Always check both dimensions

Conflicts:
	libavcodec/ituh263dec.c

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

2a227fe8

fate: Avoid unnecessary pixel format conversions · e2bd03a1

Martin Storsjö authored Jun 30, 2015

Most of the fate-dds-* and fate-txd-* tests already
output into the same pixel format regardless of
platform endianness, so there's no need to force
conversion to another format.

This fixes the tests fate-txd-16bpp, fate-txd-odd,
fate-dds-rgb16, fate-dds-rgb24 and fate-dds-xrgb on
big endian, where the tests seem to fail due to issues
with certain conversion codepaths in swscale.

Those conversion codepaths should of course be fixed, but
the individual decoder tests should use as little extra
conversion steps as possible.
Signed-off-by: Martin Storsjö <martin@martin.st>

e2bd03a1

Merge commit '' · 5585da7c

Michael Niedermayer authored Jun 30, 2015

* commit '6f4cd33e':
  cosmetic: Reformat ff_h263_decode_mba
Merged-by: Michael Niedermayer <michaelni@gmx.at>

5585da7c

Merge commit '' · cfcb9f5e

Michael Niedermayer authored Jun 30, 2015

* commit 'e95c7a61':
  mov: Preserve the metadata even when bit-exactness is requested

Conflicts:
	libavformat/movenc.c
	tests/ref/vsynth/vsynth1-mpeg4
	tests/ref/vsynth/vsynth2-mpeg4

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

cfcb9f5e

Merge commit '' · 4ff0c61b

Michael Niedermayer authored Jun 30, 2015

* commit '303ec065':
  aic: Fix slice size computation for widths multiples of 32 macroblocks
Merged-by: Michael Niedermayer <michaelni@gmx.at>

4ff0c61b