Commits · f578e5d9376a20243f4286776f79a1e1c33b12cd · Linshizhi / ffmpeg.wasm-core

01 Nov, 2013 40 commits

avcodec/hevc: Adjust white-spaces to reduce difference to 064698d3 · f578e5d9
Michael Niedermayer authored Nov 01, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
f578e5d9
hevc: fix temporal_id(cherry picked from commit 5eac0df49d33bef7f3ffc5efde19839dddb554e8) · 38612379
Mickaël Raulet authored Oct 31, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
38612379
avcodec/mvcdec: stop using deprecated avcodec_set_dimensions() · 0610d6e8
Paul B Mahol authored Nov 01, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
0610d6e8
avcodec/exr: stop using deprecated avcodec_set_dimensions() · 256b986c
Paul B Mahol authored Nov 01, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
256b986c
avcodec/sanm: stop using deprecated avcodec_set_dimensions() · 01507ab3
Paul B Mahol authored Nov 01, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
01507ab3

avcodec/tiff_common: allow count = 0 in ff_tadd_bytes_metadata() · 73d88773

Michael Niedermayer authored Oct 31, 2013

Fixes Ticket3103
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

73d88773

avformat/isom: lpcm in mov default to big endian · 8b3964ec

Mark Himsley authored Nov 01, 2013

It is my understanding that "Unless otherwise stated, all data in a
QuickTime movie is stored in big-endian byte ordering" [1] in MOV files.

I have a couple of thousand files, which technically are invalid because
their sound sample description element 4CC is 'lpcm' but its version is
0 - and "Version 0 supports only uncompressed audio in raw ('raw ') or
twos-complement ('twos') format" [2]

Because isom.c only contains a mapping for 4CC 'lpcm' to
AV_CODEC_ID_PCM_S16LE, these files have their audio decoded as LE when
it is actually BE.

This commit adds AV_CODEC_ID_PCM_S16BE as the first match for 4CC 'lpcm'.

[1]
https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf
page 21
[2]
https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf
page 178
Reviewed-by: Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

8b3964ec

Merge remote-tracking branch 'qatar/master' · 1295377f

Michael Niedermayer authored Nov 01, 2013

* qatar/master:
  rtspenc: Make sure BYE packets are sent before TEARDOWN
Merged-by: Michael Niedermayer <michaelni@gmx.at>

1295377f

Merge commit '' · 04894ef3

Michael Niedermayer authored Nov 01, 2013

* commit '9ceed7af':
  rtpenc: Add a rtpflag option for sending BYE packets when finishing

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

04894ef3

Merge commit '' · 5a7a56d7

Michael Niedermayer authored Nov 01, 2013

* commit 'b264453d':
  rtpenc: Remove some superfluous parentheses
Merged-by: Michael Niedermayer <michaelni@gmx.at>

5a7a56d7

Merge commit '' · 81c3bb78

Michael Niedermayer authored Nov 01, 2013

* commit 'd07b51bf':
  aviobuf: Handle a NULL buffer in avio_close_dyn_buf
Merged-by: Michael Niedermayer <michaelni@gmx.at>

81c3bb78

Merge commit '' · 382545ae

Michael Niedermayer authored Nov 01, 2013

* commit '28240a60':
  lavc: move FF_ASPECT_EXTENDED from avcodec.h to h263.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

382545ae

Merge commit '' · 935d0ee0

Michael Niedermayer authored Nov 01, 2013

* commit 'eb5920c1':
  lavc: deprecate unused FF_BUG_OLD_MSMPEG4
Merged-by: Michael Niedermayer <michaelni@gmx.at>

935d0ee0

Merge commit '' · 7592d30b

Michael Niedermayer authored Nov 01, 2013

* commit '0300962b':
  lavc: schedule FF_BUG_AC_VLC for removal on the next major bump.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

7592d30b

avcodec: document that FF_DEBUG_VIS_QP / FF_DEBUG_VIS_MB_TYPE should only be used through avoptions · 9bcf6478
Michael Niedermayer authored Nov 01, 2013
```
This preempts ABI issues if their values get reused by the fork for something unrelated
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
9bcf6478

Merge commit '' · 2a2cc0af

Michael Niedermayer authored Nov 01, 2013

* commit 'f8b2bcd2':
  lavc: deprecate FF_DEBUG_VIS_*

leave the AVOptions as they work fine
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2a2cc0af

avcodec/avcodec.h: move debug_mv to the end of the struct with the next ABI bump · f49e6359

Michael Niedermayer authored Nov 01, 2013

This maintains ABI compatibility
also add a note that debug_mv must be accessed through AVOptions (for ABI)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

f49e6359

Merge commit '' · 66df6f54

Michael Niedermayer authored Nov 01, 2013

* commit 'a1504eee':
  lavc: deprecate AVCodecContext.debug_mv

Conflicts:
	libavcodec/options_table.h

Not merged, debug_mv works fine
Merged-by: Michael Niedermayer <michaelni@gmx.at>

66df6f54

Merge commit '' · c97d397c

Michael Niedermayer authored Nov 01, 2013

* commit 'fae753af':
  avplay: drop -vismv option which does not do anything anymore

Conflicts:
	Changelog
	ffplay.c

Not merged, the vismv option works fine in ffplay
Merged-by: Michael Niedermayer <michaelni@gmx.at>

c97d397c

Merge commit '' · c6c03dfd

Michael Niedermayer authored Nov 01, 2013

* commit 'ccc71298':
  lavc: deprecate FF_DEBUG_MV and remove all traces of its use
Merged-by: Michael Niedermayer <michaelni@gmx.at>

c6c03dfd

Merge commit '' · 6262763d

Michael Niedermayer authored Nov 01, 2013

* commit 'b6a47016':
  mpegts: Support HEVC demuxing

Conflicts:
	Changelog
	libavformat/version.h

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

6262763d

Merge commit '' · 0fbeeb93

Michael Niedermayer authored Nov 01, 2013

* commit '959bea13':
  matroskadec: Support HEVC demuxing

Conflicts:
	Changelog
	libavformat/matroskadec.c
	libavformat/version.h

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

0fbeeb93

Merge commit '' · 3a0c9026

Michael Niedermayer authored Nov 01, 2013

* commit 'ea29f965':
  mov: Support HEVC demuxing

Conflicts:
	Changelog
	libavformat/mov.c
	libavformat/version.h

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

3a0c9026

Merge commit '' · b594aceb

Michael Niedermayer authored Nov 01, 2013

* commit '58466462':
  Add raw HEVC demuxer

Conflicts:
	Changelog
	libavformat/hevcdec.c
	libavformat/version.h

See: 902a5fa7 and later commits
Merged-by: Michael Niedermayer <michaelni@gmx.at>

b594aceb

Merge commit '' · 3552bd93

Michael Niedermayer authored Nov 01, 2013

* commit 'e1c058db':
  FATE: Add HEVC tests

Conflicts:
	tests/fate/hevc.mak
	tests/ref/fate/hevc-conformance-DBLK_A_SONY_3
	tests/ref/fate/hevc-conformance-DBLK_B_SONY_3
	tests/ref/fate/hevc-conformance-DBLK_C_SONY_3
	tests/ref/fate/hevc-conformance-DELTAQP_B_SONY_3
	tests/ref/fate/hevc-conformance-DELTAQP_C_SONY_3
	tests/ref/fate/hevc-conformance-POC_A_Bossen_3
	tests/ref/fate/hevc-conformance-RPS_D_ericsson_5
	tests/ref/fate/hevc-conformance-WP_B_Toshiba_3
	tests/ref/fate/hevc-conformance-WP_MAIN10_B_Toshiba_3

See: fb3cea4b and later commits
Merged-by: Michael Niedermayer <michaelni@gmx.at>

3552bd93

Merge commit '' · 5eb1704d

Michael Niedermayer authored Nov 01, 2013

* commit '064698d3':
  Add HEVC decoder

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/hevc.c
	libavcodec/hevc.h
	libavcodec/hevc_cabac.c
	libavcodec/hevc_filter.c
	libavcodec/hevc_mvs.c
	libavcodec/hevc_parser.c
	libavcodec/hevc_ps.c
	libavcodec/hevc_refs.c
	libavcodec/hevc_sei.c
	libavcodec/hevcdsp.c
	libavcodec/hevcdsp_template.c
	libavcodec/hevcpred.c
	libavcodec/hevcpred_template.c
	libavcodec/version.h

cosmetics from hevc.h & hevc_ps.c mostly merged, other files left as they where in ffmpeg.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

5eb1704d

lavd/xv: free graphics context · c617c669

Lukasz Marek authored Nov 01, 2013

Valgrind detects mem leak from XCreateGC.
Free it with XFreeGC.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

c617c669

Merge commit '' · 8b2dd04a

Michael Niedermayer authored Nov 01, 2013

* commit '0a9e94bb':
  webp: stop using deprecated avcodec_set_dimensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

8b2dd04a

Merge commit '' · 98ca3fb9

Michael Niedermayer authored Nov 01, 2013

* commit '757d5e8e':
  vp8: stop using deprecated avcodec_set_dimensions
  vp56: stop using deprecated avcodec_set_dimensions
  vp3: stop using deprecated avcodec_set_dimensions
  txd: stop using deprecated avcodec_set_dimensions
  truemotion1: stop using deprecated avcodec_set_dimensions

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

98ca3fb9

Merge commit '' · ffd100b1

Michael Niedermayer authored Nov 01, 2013

* commit 'c265b8bb':
  tiff: stop using deprecated avcodec_set_dimensions
  targa: stop using deprecated avcodec_set_dimensions
  svq1dec: stop using deprecated avcodec_set_dimensions
  sunrast: stop using deprecated avcodec_set_dimensions

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

ffd100b1

Merge commit '' · 7630e564

Michael Niedermayer authored Nov 01, 2013

* commit 'c755870d':
  sgidec: stop using deprecated avcodec_set_dimensions
  rv34: stop using deprecated avcodec_set_dimensions
  rv10: stop using deprecated avcodec_set_dimensions
  ptx: stop using deprecated avcodec_set_dimensions

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

7630e564

Merge commit '' · a897ba33

Michael Niedermayer authored Nov 01, 2013

* commit '0f21d8b1':
  pictordec: stop using deprecated avcodec_set_dimensions
  pgssubdec: stop using deprecated avcodec_set_dimensions
  pcx: stop using deprecated avcodec_set_dimensions
  mpegvideo_parser: stop using deprecated avcodec_set_dimensions

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

a897ba33

Merge commit '' · 64a0ed19

Michael Niedermayer authored Nov 01, 2013

* commit '13207484':
  mpeg4video_parser: stop using deprecated avcodec_set_dimensions
  mpeg12dec: stop using deprecated avcodec_set_dimensions
  mjpegdec: stop using deprecated avcodec_set_dimensions
  libvpxdec: stop using deprecated avcodec_set_dimensions

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

64a0ed19

Merge commit '' · bf92cd81

Michael Niedermayer authored Nov 01, 2013

* commit '967cd6fa':
  libopenjpegdec: stop using deprecated avcodec_set_dimensions
  kgv1dec: stop using deprecated avcodec_set_dimensions
  ivi_common: stop using deprecated avcodec_set_dimensions
  indeo3: stop using deprecated avcodec_set_dimensions

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

bf92cd81

Merge commit '' · e6b9d71a

Michael Niedermayer authored Nov 01, 2013

* commit '3b086317':
  h26[13]dec: stop using deprecated avcodec_set_dimensions
  gifdec: stop using deprecated avcodec_set_dimensions
  g2meet: stop using deprecated avcodec_set_dimensions

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

e6b9d71a

avfilter/vf_gradfun: add emms_c() for mmxext · 599c2851
Michael Niedermayer authored Nov 01, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
599c2851

Revert "Merge commit ''" · 969329fe

Clément Bœsch authored Nov 01, 2013

This reverts commit fc5fe480, reversing
changes made to ffe33500.

The factoring is broken; it's not calling the ssse3 code anymore, and
calling the mmx2 code with bad alignment. It also broke some FATE
instances.

Conflicts:
	libavfilter/x86/vf_gradfun_init.c

969329fe

avfilter/x86/vf_gradfun_init: fix some consts & related warnings · c6125f5e
Michael Niedermayer authored Nov 01, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
c6125f5e

Merge commit '' · bf688d23

Michael Niedermayer authored Nov 01, 2013

* commit 'ec706300':
  eatqi: stop using deprecated avcodec_set_dimensions
  eatgv: stop using deprecated avcodec_set_dimensions
  eatgq: stop using deprecated avcodec_set_dimensions
  eamad: stop using deprecated avcodec_set_dimensions

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

bf688d23

Merge commit '' · 4a356512

Michael Niedermayer authored Nov 01, 2013

* commit 'd6da3729':
  eacmv: stop using deprecated avcodec_set_dimensions
  dvdsubdec: stop using deprecated avcodec_set_dimensions
  dvdec: stop using deprecated avcodec_set_dimensions
  dpx: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/dpx.c
	libavcodec/dvdec.c
	libavcodec/dvdsubdec.c
	libavcodec/eacmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

4a356512