Commits · f506ae19ffb5ad1366a889b4dbec16254db4b755 · Linshizhi / ffmpeg.wasm-core

12 Mar, 2013 32 commits

Michael Niedermayer authored Mar 12, 2013

* commit 'd2438969':
  ffv1: fix calculating slice dimensions for version 2

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

f506ae19

Merge commit '' · 0cfbfaaa

Michael Niedermayer authored Mar 12, 2013

* commit '7b89cd20':
  eamad: allocate a dummy reference frame when the real one is missing
  Replace remaining includes of audioconvert.h with channel_layout.h
  Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*.

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

0cfbfaaa

Merge commit '' · a75f01d7

Michael Niedermayer authored Mar 12, 2013

* commit 'd8b31be6':
  Add the bumps and APIchanges entries for reference counted buffers changes.

Conflicts:
	Changelog
	doc/APIchanges
	libavcodec/version.h
	libavdevice/version.h
	libavfilter/version.h
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

a75f01d7

avformat: keep r_frame_rate · c292e340

Michael Niedermayer authored Mar 12, 2013

This field is used and nothing equivalent exists
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

c292e340

avformat/avdevice: add missing time.h includes · 9cf788ec
Michael Niedermayer authored Mar 12, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
9cf788ec
avcodec: postpone removial of parts still used · ad78b9ed
Michael Niedermayer authored Mar 12, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ad78b9ed

Merge commit '' · b2cd0d70

Michael Niedermayer authored Mar 12, 2013

* commit '8df23e93':
  lavc: postpone the removal of request_channels API.
  AVFrame: deprecate all now unused fields
Merged-by: Michael Niedermayer <michaelni@gmx.at>

b2cd0d70

Merge commit '' · dac87995

Michael Niedermayer authored Mar 12, 2013

* commit 'ddcca4ba':
  lavc: stop setting AVFrame.motion_subsample_log2
  avserver: don't set deprecated options.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

dac87995

Merge commit '' · 32fdfdfb

Michael Niedermayer authored Mar 12, 2013

* commit '354468fc':
  avplay: switch to new refcounted frames API
  avconv: convert to new refcounted AVFrame API

Conflicts:
	cmdutils.c
	ffmpeg.c
	ffmpeg.h
	ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

32fdfdfb

Merge commit '' · 3c132641

Michael Niedermayer authored Mar 12, 2013

* commit '37045e42':
  mpegvideo: drop vismv code

Conflicts:
	libavcodec/mpegvideo.c

vismv code works fine, and thus only the unused fields are droped
Merged-by: Michael Niedermayer <michaelni@gmx.at>

3c132641

utils: Dont sent fake channel layouts, 0 layout is better when its not known · a303dce2
Michael Niedermayer authored Mar 12, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
a303dce2

Merge commit '' · f9fd6f98

Michael Niedermayer authored Mar 12, 2013

* commit '2eba9087':
  lavc: make up a fake frame channel layout when there is no real one.

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

f9fd6f98

Merge commit '' · a7f9d92a

Michael Niedermayer authored Mar 12, 2013

* commit '192f1984':
  lavc: limit maximum number of channels to 63
Merged-by: Michael Niedermayer <michaelni@gmx.at>

a7f9d92a

Merge commit '' · 36685c3c

Michael Niedermayer authored Mar 12, 2013

* commit '15ec0450':
  lavc: allow decoders to override frame parameters.

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

36685c3c

mss1: set frame defaults · 64d11cb6
Michael Niedermayer authored Mar 12, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
64d11cb6
buffer: use the atomic get instead of the add and fetch variant. · 80661e0f
Clément Bœsch authored Mar 12, 2013

80661e0f
get_video_buffer: add vertical padding · 1ad542f1
Michael Niedermayer authored Mar 12, 2013
```
Fix memory corruption
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
1ad542f1
avcodec: fix motion vector vissualization · 53fd4f55
Michael Niedermayer authored Mar 12, 2013
```
was broken by the buffer ref stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
53fd4f55
h264/mpegvideo: fix ff_print_debug_info2 arguments · 6ae43725
Michael Niedermayer authored Mar 12, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
6ae43725
mpegvideo: move ff_print_debug_info2 to where ff_print_debug_info is · a76ef998
Michael Niedermayer authored Mar 12, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
a76ef998

atomic: prefer gcc builtins over win32 atomics, if available. · b91459e5

Hendrik Leppkes authored Mar 10, 2013

The mingw win32 atomics appear to be faulty, so they should not be used
if the gcc ones are available.
Signed-off-by: Martin Storsjö <martin@martin.st>

b91459e5

atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize · c48828f7

Martin Storsjö authored Mar 08, 2013

Not all gcc configurations have an implementation of all the atomic
operations, and some gcc configurations have some atomic builtins
implemented but not all.

Thus check for the most essential function, whose presence should
indicate that all others are present as well, since it can be used
to implement all the other ones.
Signed-off-by: Martin Storsjö <martin@martin.st>

c48828f7

snow: set frame defaults · c5362538
Michael Niedermayer authored Mar 12, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
c5362538

Merge commit '' · b5e5ed8e

Michael Niedermayer authored Mar 12, 2013

* commit '3b199d29':
  lavc decoders: properly initialize AVFrame.

Conflicts:
	libavcodec/avs.c
	libavcodec/c93.c
	libavcodec/cinepak.c
	libavcodec/flashsv.c
	libavcodec/flicvideo.c
	libavcodec/iff.c
	libavcodec/mmvideo.c
	libavcodec/msrle.c
	libavcodec/msvideo1.c
	libavcodec/qtrle.c
	libavcodec/rpza.c
	libavcodec/smacker.c
	libavcodec/smc.c
	libavcodec/tiertexseqv.c
	libavcodec/truemotion1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

b5e5ed8e

h264: disallow single unpaired fields as references of frames · 01a0283c
Michael Niedermayer authored Mar 12, 2013
```
Fixes deadlock
```
01a0283c
lavfi/moviesrc: use refcounted frames · c69acbf8
Hendrik Leppkes authored Mar 11, 2013

c69acbf8
h264: fix null pointer dereference and assertion failure · 0fc01ae3
Michael Niedermayer authored Mar 11, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
0fc01ae3

ff_alloc_picture: free tables in case of dimension mismatches · ee3c3dd5

Michael Niedermayer authored Mar 11, 2013

Fixes memory corruption
In theory this should not be needed but its better to check at
one place than to hope 50 other places set the flags correctly

ee3c3dd5

mpegvideo: dont allow last == current · 9e73f6d1
Michael Niedermayer authored Mar 11, 2013
```
this fixes deadlocks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
9e73f6d1
update_frame_pool: use channel field · 9dd0b7ad
Michael Niedermayer authored Mar 11, 2013
```
Fix memory corruption
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
9dd0b7ad

Merge commit '' · 80e9e63c

Michael Niedermayer authored Mar 12, 2013

* commit '759001c5':
  lavc decoders: work with refcounted frames.

Anton Khirnov (1):
      lavc decoders: work with refcounted frames.

Clément Bœsch (47):
      lavc/ansi: reset file
      lavc/ansi: re-do refcounted frame changes from Anton
      fraps: reset file
      lavc/fraps: switch to refcounted frames
      gifdec: reset file
      lavc/gifdec: switch to refcounted frames
      dsicinav: resolve conflicts
      smc: resolve conflicts
      zmbv: resolve conflicts
      rpza: resolve conflicts
      vble: resolve conflicts
      xxan: resolve conflicts
      targa: resolve conflicts
      vmnc: resolve conflicts
      utvideodec: resolve conflicts
      tscc: resolve conflicts
      ulti: resolve conflicts
      ffv1dec: resolve conflicts
      dnxhddec: resolve conflicts
      v210dec: resolve conflicts
      vp3: resolve conflicts
      vcr1: resolve conflicts
      v210x: resolve conflicts
      wavpack: resolve conflicts
      pngdec: fix compilation
      roqvideodec: resolve conflicts
      pictordec: resolve conflicts
      mdec: resolve conflicts
      tiertexseqv: resolve conflicts
      smacker: resolve conflicts
      vb: resolve conflicts
      vqavideo: resolve conflicts
      xl: resolve conflicts
      tmv: resolve conflicts
      vmdav: resolve conflicts
      truemotion1: resolve conflicts
      truemotion2: resolve conflicts
      lcldec: fix compilation
      libcelt_dec: fix compilation
      qdrw: fix compilation
      r210dec: fix compilation
      rl2: fix compilation
      wnv1: fix compilation
      yop: fix compilation
      tiff: resolve conflicts
      interplayvideo: fix compilation
      qpeg: resolve conflicts (FIXME/TESTME).

Hendrik Leppkes (33):
      012v: convert to refcounted frames
      8bps: fix compilation
      8svx: resolve conflicts
      4xm: resolve conflicts
      aasc: resolve conflicts
      bfi: fix compilation
      aura: fix compilation
      alsdec: resolve conflicts
      avrndec: convert to refcounted frames
      avuidec: convert to refcounted frames
      bintext: convert to refcounted frames
      cavsdec: resolve conflicts
      brender_pix: convert to refcounted frames
      cinepak: resolve conflicts
      cinepak: avoid using AVFrame struct directly in private context
      cljr: fix compilation
      cpia: convert to refcounted frames
      cscd: resolve conflicts
      iff: resolve conflicts and do proper conversion to refcounted frames
      4xm: fix reference frame handling
      cyuv: fix compilation
      dxa: fix compilation
      eacmv: fix compilation
      eamad: fix compilation
      eatgv: fix compilation
      escape124: remove unused variable.
      escape130: convert to refcounted frames
      evrcdec: convert to refcounted frames
      exr: convert to refcounted frames
      mvcdec: convert to refcounted frames
      paf: properly free the frame data on decode close
      sgirle: convert to refcounted frames
      lavfi/moviesrc: use refcounted frames

Michael Niedermayer (56):
      Merge commit '759001c5'
      resolve conflicts in headers
      motion_est: resolve conflict
      mpeg4videodec: fix conflicts
      dpcm conflict fix
      dpx: fix conflicts
      indeo3: resolve confilcts
      kmvc: resolve conflicts
      kmvc: resolve conflicts
      h264: resolve conflicts
      utils: resolve conflicts
      rawdec: resolve conflcits
      mpegvideo: resolve conflicts
      svq1enc: resolve conflicts
      mpegvideo: dont clear data, fix assertion failure on fate vsynth1 with threads
      pthreads: resolve conflicts
      frame_thread_encoder: simple compilefix not yet tested
      snow: update to buffer refs
      crytsalhd: fix compile
      dirac: switch to new API
      sonic: update to new API
      svq1: resolve conflict, update to new API
      ffwavesynth: update to new buffer API
      g729: update to new API
      indeo5: fix compile
      j2kdec: update to new buffer API
      linopencore-amr: fix compile
      libvorbisdec: update to new API
      loco: fix compile
      paf: update to new API
      proresdec: update to new API
      vp56: update to new api / resolve conflicts
      xface: convert to refcounted frames
      xan: fix compile&fate
      v408: update to ref counted buffers
      v308: update to ref counted buffers
      yuv4dec: update to ref counted buffers
      y41p: update to ref counted frames
      xbm: update to refcounted frames
      targa_y216: update to refcounted buffers
      qpeg: fix fate/crash
      cdxl: fix fate
      tscc: fix reget buffer useage
      targa_y216dec: fix style
      msmpeg4: fix fate
      h264: ref_picture() copy fields that have been lost too
      update_frame_pool: use channel field
      h264: Put code that prevents deadlocks back
      mpegvideo: dont allow last == current
      wmalossless: fix buffer ref messup
      ff_alloc_picture: free tables in case of dimension mismatches
      h264: fix null pointer dereference and assertion failure
      frame_thread_encoder: update to bufrefs
      ec: fix used arrays
      snowdec: fix off by 1 error in dimensions check
      h264: disallow single unpaired fields as references of frames

Paul B Mahol (2):
      lavc/vima: convert to refcounted frames
      sanm: convert to refcounted frames

Conflicts:
	libavcodec/4xm.c
	libavcodec/8bps.c
	libavcodec/8svx.c
	libavcodec/aasc.c
	libavcodec/alsdec.c
	libavcodec/anm.c
	libavcodec/ansi.c
	libavcodec/avs.c
	libavcodec/bethsoftvideo.c
	libavcodec/bfi.c
	libavcodec/c93.c
	libavcodec/cavsdec.c
	libavcodec/cdgraphics.c
	libavcodec/cinepak.c
	libavcodec/cljr.c
	libavcodec/cscd.c
	libavcodec/dnxhddec.c
	libavcodec/dpcm.c
	libavcodec/dpx.c
	libavcodec/dsicinav.c
	libavcodec/dvdec.c
	libavcodec/dxa.c
	libavcodec/eacmv.c
	libavcodec/eamad.c
	libavcodec/eatgq.c
	libavcodec/eatgv.c
	libavcodec/eatqi.c
	libavcodec/error_resilience.c
	libavcodec/escape124.c
	libavcodec/ffv1.h
	libavcodec/ffv1dec.c
	libavcodec/flicvideo.c
	libavcodec/fraps.c
	libavcodec/frwu.c
	libavcodec/g723_1.c
	libavcodec/gifdec.c
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_direct.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_refs.c
	libavcodec/huffyuvdec.c
	libavcodec/idcinvideo.c
	libavcodec/iff.c
	libavcodec/indeo2.c
	libavcodec/indeo3.c
	libavcodec/internal.h
	libavcodec/interplayvideo.c
	libavcodec/ivi_common.c
	libavcodec/jvdec.c
	libavcodec/kgv1dec.c
	libavcodec/kmvc.c
	libavcodec/lagarith.c
	libavcodec/libopenjpegdec.c
	libavcodec/mdec.c
	libavcodec/mimic.c
	libavcodec/mjpegbdec.c
	libavcodec/mjpegdec.c
	libavcodec/mmvideo.c
	libavcodec/motion_est.c
	libavcodec/motionpixels.c
	libavcodec/mpc7.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo.h
	libavcodec/msrle.c
	libavcodec/msvideo1.c
	libavcodec/nuv.c
	libavcodec/options_table.h
	libavcodec/pcx.c
	libavcodec/pictordec.c
	libavcodec/pngdec.c
	libavcodec/pnmdec.c
	libavcodec/pthread.c
	libavcodec/qpeg.c
	libavcodec/qtrle.c
	libavcodec/r210dec.c
	libavcodec/rawdec.c
	libavcodec/roqvideodec.c
	libavcodec/rpza.c
	libavcodec/smacker.c
	libavcodec/smc.c
	libavcodec/svq1dec.c
	libavcodec/svq1enc.c
	libavcodec/targa.c
	libavcodec/tiertexseqv.c
	libavcodec/tiff.c
	libavcodec/tmv.c
	libavcodec/truemotion1.c
	libavcodec/truemotion2.c
	libavcodec/tscc.c
	libavcodec/ulti.c
	libavcodec/utils.c
	libavcodec/utvideodec.c
	libavcodec/v210dec.c
	libavcodec/v210x.c
	libavcodec/vb.c
	libavcodec/vble.c
	libavcodec/vcr1.c
	libavcodec/vmdav.c
	libavcodec/vmnc.c
	libavcodec/vp3.c
	libavcodec/vp56.c
	libavcodec/vp56.h
	libavcodec/vp6.c
	libavcodec/vqavideo.c
	libavcodec/wavpack.c
	libavcodec/xl.c
	libavcodec/xxan.c
	libavcodec/zmbv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

80e9e63c

snowdec: fix off by 1 error in dimensions check · 2e7bc9c2
Michael Niedermayer authored Mar 11, 2013
```
fixes infinite loop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
2e7bc9c2

11 Mar, 2013 2 commits

lavfi/buffersink: move the filter structures at the end. · 73b40e2e
Nicolas George authored Mar 10, 2013
```
Also apply a few cosmetic fixes (spaces, trailing comma) to
help match them with the fork's implementation.
```
73b40e2e

cmdutils: remove conditionnal pp include. · 1123080d

Clément Bœsch authored Mar 11, 2013

The definition of the include are needed for builds even without pp.
This should fix FATE with --disable-gpl after 63edd2f9.

1123080d

10 Mar, 2013 6 commits

lavfi/buffersink: implement av_buffersink_get_samples(). · de54a96a

Nicolas George authored Mar 10, 2013

Note: the implementation could be more efficient, but at
the cost of more diff.

Most of the code from the following commit:

commit a2cd9be2
Author: Anton Khirnov <anton@khirnov.net>
Date:   Fri May 4 19:22:38 2012 +0200

    lavfi: add an audio buffer sink.

Adapted to call av_buffersink_get_frame_flags() instead of
accessing the frame directly.

de54a96a

lavfi/buffersrc: do not dereference NULL frame. · b71db3f3
Nicolas George authored Mar 10, 2013
```
frame = NULL is used to indicate EOF.
```
b71db3f3
lavfi: rename sink_buffer.c into buffersink.c. · 03b87fe5
Nicolas George authored Mar 10, 2013

03b87fe5
lavfi: remove buffersink.c. · 3add5dc8
Nicolas George authored Mar 10, 2013
```
It only contains merge conflicts leftovers.
The real code is in sink_buffer.c.
```
3add5dc8

lavfi/sink_buffer: move stuff to reduce the diff. · fa41f7ec

Nicolas George authored Mar 10, 2013

Note: av_buffersink_get_samples() is not yet implemented,
abuffersink is not yet a drop-in replacement of the fork's
abuffersink.

fa41f7ec

lavfi/smartblur: add support to named options · 35135a39
Stefano Sabatini authored Mar 10, 2013

35135a39