Commits · 66df6f5407543cf791302bf3bc6958758bdae0eb · Linshizhi / ffmpeg.wasm-core

01 Nov, 2013 36 commits

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

Merge commit '' · f016a23c

Michael Niedermayer authored Nov 01, 2013

* commit 'c7a5acab':
  dnxhddec: stop using deprecated avcodec_set_dimensions
  dirac: stop using deprecated avcodec_set_dimensions
  cdxl: stop using deprecated avcodec_set_dimensions
  avs: stop using deprecated avcodec_set_dimensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

f016a23c

Merge commit '' · 5ef0c005

Michael Niedermayer authored Nov 01, 2013

* commit '78780c8b':
  ansi: stop using deprecated avcodec_set_dimensions

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

5ef0c005

Merge commit '' · 66f436ad

Michael Niedermayer authored Nov 01, 2013

* commit '0f6c1d6d':
  lavc/utils: stop using deprecated avcodec_set_dimensions

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

66f436ad

Merge commit '' · 51c5768c

Michael Niedermayer authored Nov 01, 2013

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

51c5768c

Merge commit '' · 7b91e9cf

Michael Niedermayer authored Nov 01, 2013

* commit '7644f5a8':
  lavc: replace avcodec_set_dimensions with ff_set_dimensions

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

7b91e9cf

h264: simplify frame_recovered code · f62dfed3

Michael Niedermayer authored Nov 01, 2013

This is a separate commit to ease future bisecting in case it breaks something.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

f62dfed3

Merge commit '' · 78265fcf

Michael Niedermayer authored Nov 01, 2013

* commit '28096e0a':
  h264: wait for initial complete frame before outputing frames

Conflicts:
	doc/APIchanges
	libavcodec/h264.c
	libavcodec/mpegvideo.h
	libavutil/frame.h
	libavutil/version.h

See: a64b028a (as well as various later commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>

78265fcf

doc/encoders: add libfaac encoder documentation · 2acc525d
Stefano Sabatini authored Oct 30, 2013

2acc525d
doc/encoders: document the libfdk-aac wrapper · d339e03f
Stefano Sabatini authored Oct 29, 2013
```
Partially based on the https://trac.ffmpeg.org/wiki/AACEncodingGuide
guide.
```
d339e03f
doc/encoders: extend/clarify libtheora encoder documentation · 4fdec65e
Stefano Sabatini authored Oct 30, 2013

4fdec65e

Merge commit '' · a2bfee36

Michael Niedermayer authored Nov 01, 2013

* commit '9af7a852':
  HNM4/HNM4A demuxer & video decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

a2bfee36

Merge commit '' · fc5fe480

Michael Niedermayer authored Nov 01, 2013

* commit 'ed1a11ed':
  gradfun: x86: Factor out common code for some gradfun_filter_line() variants

Conflicts:
	libavfilter/x86/vf_gradfun_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

fc5fe480

Merge commit '' · ffe33500

Michael Niedermayer authored Nov 01, 2013

* commit 'ee80cf74':
  avfilter: x86: K&R formatting cosmetics

Conflicts:
	libavfilter/x86/vf_gradfun_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

ffe33500

31 Oct, 2013 4 commits
- avcodec/wmv2enc: Collect statistics for 2 pass encoding · ec5e02d4
  Michael Niedermayer authored Oct 31, 2013
```
Fixes Ticket3053
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  ec5e02d4
- MAINTAINERS: add myself as libzvbi-teletextdec maintainer · e1573d71
  Marton Balint authored Oct 31, 2013
```
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  e1573d71
- aacdec: fix small comment, update decoder features comment · 6173b0fe
  Compn authored Oct 31, 2013
  
  6173b0fe
- lavc: deprecate AVCodecContext.debug_mv · a1504eee
  Anton Khirnov authored Oct 27, 2013
```
It has been unused since 37045e42.
```
  a1504eee