Commits · 2baf1c8c6080ba03dd399be895a9545054196804 · Linshizhi / ffmpeg.wasm-core

05 May, 2014 25 commits

avcodec/snowenc: Fix "incompatible pointer type" warning · 2baf1c8c
Michael Niedermayer authored May 05, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
2baf1c8c
avfilter/af_bs2b: Fix incompatible pointer type warnings · 5fc4c009
Michael Niedermayer authored May 05, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
5fc4c009
avcodec/svq3: Fix "incompatible pointer type" warnings · 89d2fc62
Michael Niedermayer authored May 05, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
89d2fc62
avformat/segment: Use av_malloc_array() · 1394e0a9
Michael Niedermayer authored May 05, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
1394e0a9
avutil/file_open: Use av_mallocz_array() · 4aa7848e
Michael Niedermayer authored May 05, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
4aa7848e
tests/tiny_ssim: more correct error message · e77ffaa0
Michael Niedermayer authored May 05, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
e77ffaa0
avutil/audio_fifo: Use av_mallocz_array() · 2ded5721
Michael Niedermayer authored May 05, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
2ded5721
tools/ismindex: use av_mallocz_array() · b395167d
Michael Niedermayer authored May 05, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
b395167d
tests/tiny_ssim: check dimensions · a69e16a9
Michael Niedermayer authored May 05, 2014
```
Fix integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
a69e16a9

lavu/fifo: add const to arguments · 78d3453c

Lukasz Marek authored May 04, 2014

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

78d3453c

avformat/astenc: avoid using AVCodecContext.frame_number · 47550e62

Michael Niedermayer authored May 05, 2014

Theres no gurantee that the user application has initialized it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

47550e62

Merge commit '' · ba040d4c

Michael Niedermayer authored May 05, 2014

* commit '3828eb85':
  libfdk-aac: Relicense the library wrappers to 2-clause BSD

Conflicts:
	libavcodec/libfdk-aacdec.c
	libavcodec/libfdk-aacenc.c

<Daemon404> michaelni, fyi, for the fdk relicensing, wbs also contact all the ffmpeg-only contributers
<Daemon404> so it should be fine to merge.

Thanks-to: Martin Storsjö <martin@martin.st>
Merged-by: Michael Niedermayer <michaelni@gmx.at>

ba040d4c

Merge commit '' · db9c1386

Michael Niedermayer authored May 05, 2014

* commit '15fa856b':
  libfdk-aacenc: Enable 7.1 channel encoding

See: 91489d28, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

db9c1386

Merge commit '' · d5ec1ddf

Michael Niedermayer authored May 05, 2014

* commit '9580818c':
  avconv: rename OutputStream.opts to OutputStream.encoder_opts

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

d5ec1ddf

Merge commit '' · 22ffa539

Michael Niedermayer authored May 05, 2014

* commit '01947f07':
  avconv: remove a useless line
Merged-by: Michael Niedermayer <michaelni@gmx.at>

22ffa539

Merge commit '' · 1efc0892

Michael Niedermayer authored May 05, 2014

* commit '65ed9e75':
  avconv: rename 'codec' to 'enc_ctx'

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

1efc0892

Merge commit '' · 1f40536c

Michael Niedermayer authored May 05, 2014

* commit '650a5206':
  avconv: rename 'icodec' to 'dec_ctx'

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

1f40536c

Merge commit '' · 42b7bda4

Michael Niedermayer authored May 05, 2014

* commit 'f3a6ad22':
  avconv: rename InputStream.opts to InputStream.decoder_opts

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

42b7bda4

Merge commit '' · 6e397074

Michael Niedermayer authored May 05, 2014

* commit '73ed8558':
  avconv: simplify exit_program() by using more local vars

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

6e397074

libfdk-aac: Relicense the library wrappers to 2-clause BSD · 3828eb85

Martin Storsjö authored Apr 30, 2014

This should make it possible for Fraunhofer to contribute to these
wrappers - they didn't want to contribute to code under LGPL2.1 with
the "or any later version" clause (which allowed using the code
under the LGPL3 license).
Signed-off-by: Martin Storsjö <martin@martin.st>

3828eb85

libfdk-aacenc: Enable 7.1 channel encoding · 15fa856b

Jean First authored Jan 26, 2014

7.1(wide) and 7.1(wide-side) channel layouts are supported in
fdk-aac since the 0.1.3 release.

The earlier versions of fdk-aac didn't include any library
version defines in the public headers, thus checking for
the AACENCODER_LIB_VL0 define is enough to know that we're
building against a new enough version of fdk-aac.

This change includes contributions by Tim Walker,
Michael Niedermayer and Timothy Gu.
Signed-off-by: Martin Storsjö <martin@martin.st>

15fa856b

Fix standalone compilation of sonic lossless encoder. · db01de4c
Carl Eugen Hoyos authored May 05, 2014

db01de4c
avfilter/f_select: fix incompatible pointer type warning · 6bd17412
Michael Niedermayer authored May 05, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
6bd17412
avcodec/lossless_videodsp: fix incompatible pointer type warning · ebf2c2c3
Michael Niedermayer authored May 05, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ebf2c2c3
avisynth: set duration of audio streams · ae8e2d76
Hendrik Leppkes authored May 04, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ae8e2d76

04 May, 2014 15 commits
- swscale/utils: use FF_ALLOC(Z)_ARRAY_OR_GOTO() and av_malloc(z)_array() · 656fe7ec
  Michael Niedermayer authored May 04, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  656fe7ec
- avutil/pca: Use av_malloc_array() · beecfa81
  Michael Niedermayer authored May 04, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  beecfa81
- MAINTANERS: update snow/ffv1/nut entries as these are no longer in a single file · 35e16b1b
  Michael Niedermayer authored May 04, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  35e16b1b
- Merge remote-tracking branch 'cehoyos/master' · aeeb3d46
  Michael Niedermayer authored May 04, 2014
```
* cehoyos/master:
  Map --enable-lto to -ipo when compiling with icc.
  Disable inline_asm_direct_symbol_refs if lto was requested.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  aeeb3d46
- Map --enable-lto to -ipo when compiling with icc. · 431c7bd3
  Carl Eugen Hoyos authored May 04, 2014
  
  431c7bd3
- Disable inline_asm_direct_symbol_refs if lto was requested. · a64df19c
  Carl Eugen Hoyos authored May 04, 2014
```
This fixes link time optimizations with gcc without disabling inline asm.

Fixes ticket #2941.
```
  a64df19c
- lavf/mux: pass options to nested structs of priv data · c9a12fdd
  Lukasz Marek authored May 04, 2014
```
This is continuation of commit 330d547e
Nested struct is set in two places.
Previous commit set nested struct only in one case.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  c9a12fdd
- avcodec/h263dec: use AV_EF_IGNORE_ERR · 336901e0
  Michael Niedermayer authored May 02, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  336901e0
- avformat: add AV_EF_IGNORE_ERR · e94b08f0
  Michael Niedermayer authored May 02, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  e94b08f0
- avcodec: add AV_EF_IGNORE_ERR · d7ade20a
  Michael Niedermayer authored May 02, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  d7ade20a
- doc/codecs: document ignore_err · 928e2a7d
  Michael Niedermayer authored May 02, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  928e2a7d
- avfilter/lut3d: support 3DLUTSIZE directive for Davinci files. · 7c3941b2
  Clément Bœsch authored May 04, 2014
```
Fixes Ticket #2847.
```
  7c3941b2
- MAINTAINERS: add myself as lavd/xv maintainer · 3316556c
  Lukasz Marek authored May 02, 2014
```
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  3316556c
- Maintainers: add myself for msvc and icl. · c25b0b77
  Matt Oliver authored May 03, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  c25b0b77
- Enable inline asm in intel compiler on windows. · a6b0c0e1
  Matt Oliver authored May 03, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  a6b0c0e1