Commits · 74a8fe9483acbfd5dce34d2571a1d47e4dc654f3 · Linshizhi / ffmpeg.wasm-core

17 Nov, 2013 20 commits

doc/ffmpeg: document qscale and video stream special case · 74a8fe94
Michael Niedermayer authored Nov 17, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
74a8fe94
fate: add h261 trellis quantization test · 459c7cb2
Michael Niedermayer authored Nov 17, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
459c7cb2
avcodec/h261: trellis quantization support · 331a90ce
Michael Niedermayer authored Nov 17, 2013
```
Fixes ticket3143
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
331a90ce

Merge remote-tracking branch 'qatar/master' · be1e6e75

Michael Niedermayer authored Nov 17, 2013

* qatar/master:
  mpegvideo_enc: use the AVFrame API properly.
  ffv1: use the AVFrame API properly.
  jpegls: use the AVFrame API properly.
  huffyuv: use the AVFrame API properly.

Conflicts:
	libavcodec/ffv1.c
	libavcodec/ffv1.h
	libavcodec/ffv1dec.c
	libavcodec/ffv1enc.c

Changes to ffv1 are more redone than merged due to them being based on
an ancient codebase and a good part of that having being done already
as well.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

be1e6e75

Merge commit '' · f4f7888b

Michael Niedermayer authored Nov 17, 2013

* commit 'ffe04c33':
  libxvid: use the AVFrame API properly.
  pcxenc: use the AVFrame API properly.
  roqvideo: remove unused variables
  libschroedingerenc: use the AVFrame API properly.

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

f4f7888b

Merge commit '' · a0c0629d

Michael Niedermayer authored Nov 17, 2013

* commit '97168b20':
  eatgv: use the AVFrame API properly.
  libxavs: use the AVFrame API properly.
  nuv: use the AVFrame API properly.
  flashsvenc: use the AVFrame API properly.

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

a0c0629d

Merge commit '' · 5b0c70c2

Michael Niedermayer authored Nov 17, 2013

* commit '57e7b3a8':
  dnxhdenc: use the AVFrame API properly.
  libx264: use the AVFrame API properly.
  svq1enc: use the AVFrame API properly.
  gif: use the AVFrame API properly.

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

5b0c70c2

Merge commit '' · 3ea168ed

Michael Niedermayer authored Nov 17, 2013

* commit '45bde93e':
  sunrastenc: use the AVFrame API properly.
  targaenc: use the AVFrame API properly.
  tiffenc: use the AVFrame API properly.
  pngenc: use the AVFrame API properly.

Conflicts:
	libavcodec/pngenc.c
	libavcodec/sunrastenc.c
	libavcodec/targaenc.c
	libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

3ea168ed

Merge commit '' · 85b7b0c5

Michael Niedermayer authored Nov 17, 2013

* commit '0ea430c7':
  lclenc: use the AVFrame API properly.

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

85b7b0c5

Merge commit '' · 92cbd775

Michael Niedermayer authored Nov 17, 2013

* commit 'd48c2063':
  qtrleenc: use the AVFrame API properly.
  ulti: use the AVFrame API properly.
  vc1: use the AVFrame API properly.
  flashsv: use the AVFrame API properly.

Conflicts:
	libavcodec/flashsv.c
	libavcodec/qtrleenc.c
	libavcodec/ulti.c
	libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

92cbd775

Merge commit '' · 9ad477d9

Michael Niedermayer authored Nov 17, 2013

* commit 'e4155f15':
  eamad: use the AVFrame API properly.
  dpxenc: use the AVFrame API properly.
  bmpenc: use the AVFrame API properly.
  sgienc: use the AVFrame API properly.

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

9ad477d9

Merge commit '' · 8d193a24

Michael Niedermayer authored Nov 17, 2013

* commit '730bac7b':
  mss4: use the AVFrame API properly.
  mss3: use the AVFrame API properly.
  mss2: use the AVFrame API properly.
  mss1: use the AVFrame API properly.

Conflicts:
	libavcodec/mss1.c
	libavcodec/mss2.c
	libavcodec/mss3.c
	libavcodec/mss4.c

See: 02fe531a
See: ff1c13b1
See: 310bf283Merged-by: Michael Niedermayer <michaelni@gmx.at>

8d193a24

Merge commit '' · 72df8708

Michael Niedermayer authored Nov 17, 2013

* commit '508b3755':
  tiertexseqv: use the AVFrame API properly.
  smc: use the AVFrame API properly.
  truemotion2: use the AVFrame API properly.
  truemotion1: use the AVFrame API properly.

Conflicts:
	libavcodec/smc.c
	libavcodec/tiertexseqv.c
	libavcodec/truemotion1.c
	libavcodec/truemotion2.c

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

72df8708

Merge commit '' · 4362f272

Michael Niedermayer authored Nov 17, 2013

* commit '4a4841d4':
  fraps: use the AVFrame API properly.
  rpza: use the AVFrame API properly.
  motionpixels: use the AVFrame API properly.
  vmdvideo: use the AVFrame API properly.

Conflicts:
	libavcodec/fraps.c
	libavcodec/motionpixels.c
	libavcodec/rpza.c
	libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

4362f272

Merge commit '' · 8af7774c

Michael Niedermayer authored Nov 17, 2013

* commit '3c8ea9d4':
  vmnc: use the AVFrame API properly.
  xan: use the AVFrame API properly.
  xxan: use the AVFrame API properly.
  zerocodec: use the AVFrame API properly.

Conflicts:
	libavcodec/vmnc.c
	libavcodec/xan.c
	libavcodec/xxan.c

See: cf5ab8b6
See: ad438f45
See: 67607e20Merged-by: Michael Niedermayer <michaelni@gmx.at>

8af7774c

Merge commit '' · fe3808ed

Michael Niedermayer authored Nov 17, 2013

* commit 'a837c4f2':
  zmbvenc: use the AVFrame API properly.
  flicvideo: use the AVFrame API properly.
  smacker: use the AVFrame API properly.
  mmvideo: use the AVFrame API properly.

Conflicts:
	libavcodec/flicvideo.c
	libavcodec/mmvideo.c
	libavcodec/smacker.c
	libavcodec/zmbvenc.c

See: 76e27b1d
See: 099e57bcMerged-by: Michael Niedermayer <michaelni@gmx.at>

fe3808ed

Merge commit '' · 9f890a16

Michael Niedermayer authored Nov 17, 2013

* commit '2e09096d':
  kgv1: use the AVFrame API properly.
  indeo2: use the AVFrame API properly.
  iff: use the AVFrame API properly.
  msrle: use the AVFrame API properly.

Conflicts:
	libavcodec/iff.c
	libavcodec/indeo2.c
	libavcodec/kgv1dec.c
	libavcodec/msrle.c

See: 451b2ca1
See: 80e9e63c
See: 057dce5fMerged-by: Michael Niedermayer <michaelni@gmx.at>

9f890a16

Merge commit '' · 10ac6f3c

Michael Niedermayer authored Nov 17, 2013

* commit '952f943d':
  FATE: add a jv test

Conflicts:
	tests/fate/video.mak
	tests/ref/fate/jv

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

10ac6f3c

Merge commit '' · ddfdcd2b

Michael Niedermayer authored Nov 17, 2013

* commit 'b7462a39':
  jvdec: use the AVFrame API properly.

Conflicts:
	libavcodec/jvdec.c

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

ddfdcd2b

Merge commit '' · 5219afc0

Michael Niedermayer authored Nov 17, 2013

* commit '2d2a92f7':
  dxa: use the AVFrame API properly.
  qpeg: use the AVFrame API properly.
  cin video: use the AVFrame API properly.
  msvideo1: use the AVFrame API properly.

Conflicts:
	libavcodec/dsicinav.c
	libavcodec/dxa.c
	libavcodec/msvideo1.c
	libavcodec/qpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

5219afc0

16 Nov, 2013 20 commits

Merge commit '' · bfb1f44d

Michael Niedermayer authored Nov 16, 2013

* commit 'a639ea7f':
  escape124: use the AVFrame API properly.
  qtrle: use the AVFrame API properly.
  cljr: use the AVFrame API properly.
  cinepak: use the AVFrame API properly.

Conflicts:
	libavcodec/cinepak.c
	libavcodec/cljr.c
	libavcodec/qtrle.c

See: 80e9e63c libavcodec/cinepak.c
See: 71c37898Merged-by: Michael Niedermayer <michaelni@gmx.at>

bfb1f44d

Merge commit '' · 21c41e76

Michael Niedermayer authored Nov 16, 2013

* commit 'cec5ce49':
  cdxl: remove an unused variable
  c93: use the AVFrame API properly.
  bethsoftvid: use the AVFrame API properly.
  avs: use the AVFrame API properly.

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

21c41e76

Merge commit '' · cc4a6435

Michael Niedermayer authored Nov 16, 2013

* commit '6139f481':
  asvenc: use the AVFrame API properly.
  a64multienc: use the AVFrame API properly.

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

cc4a6435

Merge commit '' · 29c83d23

Michael Niedermayer authored Nov 16, 2013

* commit 'b9fb59d2':
  lavc: deprecate avcodec_alloc_frame().
Merged-by: Michael Niedermayer <michaelni@gmx.at>

29c83d23

Merge commit '' · 0ee905e2

Michael Niedermayer authored Nov 16, 2013

* commit '5b9c3b45':
  Replace all instances of avcodec_alloc_frame() with av_frame_alloc().

Conflicts:
	doc/examples/decoding_encoding.c
	doc/examples/muxing.c
	ffmpeg.c
	libavcodec/alacenc.c
	libavcodec/libopenjpegenc.c
	libavcodec/libvpxenc.c
	libavcodec/pcm.c
	libavcodec/xbmenc.c
	libavcodec/xwdenc.c
	libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

0ee905e2

Merge commit '' · 571a99de

Michael Niedermayer authored Nov 16, 2013

* commit '2ff302cb':
  lavc: update coded_frame doxy.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

571a99de

Merge commit '' · ec9aef56

Michael Niedermayer authored Nov 16, 2013

* commit 'b068660f':
  lavc: deprecate CODEC_CAP_NEG_LINESIZES

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

ec9aef56

avcodec/vp9: assert on sane size in update_size(). · 484f8d77

Clément Bœsch authored Nov 16, 2013

w and h are both read as uint16 + 1 so this can not happen. A similar
change was introduced in 97962b27 / 72ca830f, with the
av_log()+AVERROR_INVALIDDATA form, suggesting it could be triggerable
somehow.

Change suggested by Ronald S. Bultje.

484f8d77

avcodec/vp9: remove some reset-to-zero from vp9_decode_free(). · c20a7ce6

Clément Bœsch authored Nov 16, 2013

Those should not be necessary.

Original change by one of these developers:
    Anton Khirnov <anton@khirnov.net>
    Diego Biurrun <diego@biurrun.de>
    Luca Barbato <lu_zero@gentoo.org>
    Martin Storsjö <martin@martin.st>

See 97962b27 / 72ca830f

c20a7ce6

avcodec/vp9: add a never triggerable assert. · 7e704b1e

Clément Bœsch authored Nov 16, 2013

vp8_rac_get_tree() is called with a tree of size 3, so the returned
value can not be outside [0;3]. All of the [0;3] cases are handled in
the switch, so the assert should not be triggerable by any means. A
similar change was introduced in 97962b27 / 72ca830f, with the
av_log()+AVERROR_INVALIDDATA form, suggesting it could be triggerable
somehow. This assert might help static analyzer, or simply the reader.

7e704b1e

Merge remote-tracking branch 'cus/stable' · cee63a14

Michael Niedermayer authored Nov 16, 2013

* cus/stable:
  ffplay: calculate last frame duration from vp->pts instead of frame_last_pts
  ffplay: simplify early frame drop code
Merged-by: Michael Niedermayer <michaelni@gmx.at>

cee63a14

swscale/swscale_unscaled: fix right column handling in planarCopyWrapper · 6909a611
Michael Niedermayer authored Nov 16, 2013
```
Found-by: Михаил <Micky53@mail.ru>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
6909a611

vp9: Ensure that the arithmetic coder values are read in the right order · ab80d7e8

Martin Storsjö authored Nov 11, 2013

The operands of an addition can be evaluated in any order, since
the addition isn't a sequence point. The only operators that
have a defined evaluation order are &&, ||, ?: and the sequence
operator ','.

This fixes fate-vp9 on ARM RVCT.

ab80d7e8

mpegvideo_enc: use the AVFrame API properly. · 1c01b025
Anton Khirnov authored Nov 09, 2013

1c01b025
ffv1: use the AVFrame API properly. · a6064b12
Anton Khirnov authored Nov 09, 2013

a6064b12
jpegls: use the AVFrame API properly. · 706a9292
Anton Khirnov authored Nov 09, 2013

706a9292
huffyuv: use the AVFrame API properly. · 14b35bf0
Anton Khirnov authored Nov 09, 2013

14b35bf0
libxvid: use the AVFrame API properly. · ffe04c33
Anton Khirnov authored Nov 09, 2013

ffe04c33
pcxenc: use the AVFrame API properly. · 863a670e
Anton Khirnov authored Nov 09, 2013

863a670e
roqvideo: remove unused variables · 7ca97aa7
Anton Khirnov authored Nov 09, 2013

7ca97aa7