Commits · c09248aecd0d3f03064387734094ec75a23e1078 · Linshizhi / ffmpeg.wasm-core

24 Feb, 2016 40 commits

avfilter/af_astats: reset stats prior not after filtering · c09248ae
Paul B Mahol authored Feb 24, 2016
```
This way stats printed at uninit are also useful.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
c09248ae

Michael Niedermayer authored Feb 24, 2016

This broke packed_maindata.mp3.mp4
Its unknown to me what this commit would have fixed
Reviewed-by: James Almer <jamrial@gmail.com>

This reverts commit 79127dbb, reversing
changes made to 9fad1ce7.

5870f2a1

configure: add missing vc1dsp dependency to vc1_decoder · fc404460

James Almer authored Feb 24, 2016

Fixes compilation of vc1_decoder when vc1_parser is not enabled
Signed-off-by: James Almer <jamrial@gmail.com>

fc404460

avfilter/vf_blend: add freeze and heat modes · b6a0aa1c
Paul B Mahol authored Feb 24, 2016
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
b6a0aa1c

Merge commit '' · 2ef37691

Derek Buitenhuis authored Feb 24, 2016

This commit is a no-op. We already do this.

* commit 'bf7be043':
  matroska: Always consider S_TEXT/UTF8 as SRT when demuxing
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

2ef37691

Merge commit '' · 8ae21fd9

Derek Buitenhuis authored Feb 24, 2016

* commit '8caadfc5':
  fate: Be silent when switching to Git branch
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

8ae21fd9

Merge commit '' · 79b1a24b

Derek Buitenhuis authored Feb 24, 2016

* commit '8d918a98':
  rtpdec: Use the right logging context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

79b1a24b

Merge commit '' · ef7ce480

Derek Buitenhuis authored Feb 24, 2016

* commit 'd24bd96b':
  build: Disentangle VC-1 decoder and parser
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

ef7ce480

Merge commit '' · b056482e

Derek Buitenhuis authored Feb 24, 2016

* commit '15a24614':
  build: Add vc1dsp component for more fine-grained dependencies
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

b056482e

Merge commit '' · 2814f06a

Derek Buitenhuis authored Feb 24, 2016

* commit 'f9fbd474':
  msmpeg4data: Move WMV2 data tables to their own file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

2814f06a

Merge commit '' · 133aa686

Derek Buitenhuis authored Feb 24, 2016

* commit '79866803':
  msmpeg4data: K&R formatting cosmetics
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

133aa686

Merge commit '' · d61849f0

Derek Buitenhuis authored Feb 24, 2016

* commit 'b10c33c5':
  build: Add missing mpegvideo dependency for the MSS2 and VC-1 decoders
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

d61849f0

Merge commit '' · 0ffaae60

Derek Buitenhuis authored Feb 24, 2016

* commit '7d16d853':
  build: More precise dependencies for h264dsp
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

0ffaae60

Merge commit '' · dc610143

Derek Buitenhuis authored Feb 24, 2016

This commit is a no-op. We already set this.

* commit 'f273f7fb':
  mkv: Force the full parsing of mp3
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

dc610143

Merge commit '' · 79127dbb

Derek Buitenhuis authored Feb 24, 2016

* commit '3ef98937':
  mov: Force the full parsing of mp3
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

79127dbb

Merge commit '' · 9fad1ce7

Derek Buitenhuis authored Feb 24, 2016

This commit is a no-op.

We have already reverted the configure changes, and we do not have a typo
in configure.

* commit 'b4a0f172':
  Revert all recent configure changes related to dependency resolution
  build: Fix typo in HEVC VDPAU hwaccel dependencies
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

9fad1ce7

Merge commit '' · f99195d5

Derek Buitenhuis authored Feb 24, 2016

* commit '0d1229f1':
  voc: Split ff_voc_get_packet into a separate file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

f99195d5

Merge commit '' · 745d0c03

Derek Buitenhuis authored Feb 24, 2016

* commit '624e2355':
  build: Introduce iso_media component
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

745d0c03

Merge commit '' · 34e4c588

Derek Buitenhuis authored Feb 24, 2016

* commit '82454c3a':
  build: Let the WTV demuxer select the MPEG-TS demuxer
  build: Adjust mpeg4video parser dependencies
  build: Fix mpegvideo component dependencies
  build: Fix dependencies for components relying on H.263 data tables
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

34e4c588

Merge commit '' · 3c5a040a

Derek Buitenhuis authored Feb 24, 2016

* commit 'e4531293':
  build: Add missing dependencies for eatqi decoder
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

3c5a040a

Merge commit '' · 7e12a3d5

Derek Buitenhuis authored Feb 24, 2016

* commit '71eaefa6':
  build: Add missing celp_math dependency for G723_1 encoder and decoder
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

7e12a3d5

Merge commit '' · ca408cf5

Derek Buitenhuis authored Feb 24, 2016

* commit '7c82d31c':
  checkasm: Use standard multiple inclusion guards
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

ca408cf5

Merge commit '' · aaa3d622

Derek Buitenhuis authored Feb 24, 2016

* commit '3d8025d6':
  profiles: Add missing #endif comment
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

aaa3d622

Merge commit '' · 5eb40737

Derek Buitenhuis authored Feb 24, 2016

* commit '6b96d2dc':
  cosmetics: Drop particularly redundant silly comments
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

5eb40737

Merge commit '' · 1a12eb4a

Derek Buitenhuis authored Feb 24, 2016

* commit '29c2d06d':
  cosmetics: Drop empty comment lines
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

1a12eb4a

Merge commit '' · cb035553

Derek Buitenhuis authored Feb 24, 2016

* commit 'd847a408':
  hwcontext_cuda/vdpau: add to skipheaders
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

cb035553

Merge commit '' · 0d4c0240

Derek Buitenhuis authored Feb 24, 2016

* commit '9c0bc1e9':
  qsv: add a missing #include
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

0d4c0240

Merge commit '' · f6d633d7

Derek Buitenhuis authored Feb 24, 2016

* commit 'b9296243':
  mov: Fix the format specifier type for size
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

f6d633d7

Merge commit '' · 33215d3c

Derek Buitenhuis authored Feb 24, 2016

This is a no-op. This was a part of the already-reverted
broken configure saga.

* commit '2edc7187':
  configure: Relax the implication of --enable for components
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

33215d3c

Merge commit '' · 2cfb34a4

Derek Buitenhuis authored Feb 24, 2016

* commit '47570dbd':
  fft: ppc: Place ff_fft_calc_interleave_altivec() under correct ifdefs
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

2cfb34a4

Merge commit '' · 259fef86

Derek Buitenhuis authored Feb 24, 2016

* commit 'c15f6098':
  avconv: pass the hw context from filters to the encoder
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

259fef86

Merge commit '' · e05704bd

Derek Buitenhuis authored Feb 24, 2016

Timo is going to implement this for us.

* commit '871d0930':
  nvenc: support CUDA frames as input
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

e05704bd

Merge commit '' · 7e49cdd1

Derek Buitenhuis authored Feb 24, 2016

* commit '7b3214d0':
  lavc: add a field for passing AVHWFramesContext to encoders
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

7e49cdd1

Merge commit '' · ef9915a0

Derek Buitenhuis authored Feb 24, 2016

* commit '21f7cd4a':
  lavfi: add a filter for uploading normal frames to CUDA
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

ef9915a0

Merge commit '' · 14f942b3

Derek Buitenhuis authored Feb 24, 2016

This commit is a no-op.

* commit '1bf34134':
  avconv: use the new buffersrc parameters API
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

14f942b3

Merge commit '' · 10424024

Derek Buitenhuis authored Feb 24, 2016

* commit 'b3dd30db':
  lavfi: pass the hw frames context through the filter chain
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

10424024

Merge commit '' · 6992276a

Derek Buitenhuis authored Feb 24, 2016

* commit 'ad884d10':
  hwcontext: add a CUDA implementation
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

6992276a

Merge commit '' · 63c3e353

Derek Buitenhuis authored Feb 24, 2016

* commit '7bc780cd':
  pixfmt: add a CUDA hwaccelled format
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

63c3e353

configure: Allow linking to CUDA dynamically instead of dlopen()ing it at runtime · 9f2c1c77

Anton Khirnov authored Jan 13, 2016

This currently doesn't do anything, but will be used later for hwaccel
filters and libavutil.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

9f2c1c77

img2dec: Support Progressive JPEG in jpeg_probe · e1c15a94

Justin Ruggles authored Feb 24, 2016

There can be multiple SOS markers, so do not return 0 in that case.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

e1c15a94