Commits · 5d166de25853a41c6e2e2067f253271f22f94098 · Linshizhi / ffmpeg.wasm-core

26 Feb, 2014 2 commits

Merge remote-tracking branch 'qatar/master' · 5d166de2

Michael Niedermayer authored Feb 26, 2014

* qatar/master:
  lavfi: add compand audio filter

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/af_compand.c
	libavfilter/allfilters.c
	libavfilter/version.h

The filter is added as new one so as to ease clean merging of its changes
in debug-able steps
See: 6b68e2a4Merged-by: Michael Niedermayer <michaelni@gmx.at>

5d166de2

lavfi: add compand audio filter · 738f8358
Andrew Kelley authored Feb 26, 2014
```
Signed-off-by: Anton Khirnov <anton@khirnov.net>
```
738f8358

25 Feb, 2014 15 commits
- Read bits_per_coded_sample from V_MS/VFW/FOURCC mkv files. · 96fc2908
  Carl Eugen Hoyos authored Feb 25, 2014
```
Fixes ticket #3425.
```
  96fc2908
- Merge remote-tracking branch 'qatar/master' · 26733570
  Michael Niedermayer authored Feb 25, 2014
```
* qatar/master:
  parser: cosmetics: Drop some unnecessary parentheses
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  26733570
- Merge commit 'e7dfaf16' · 1f2bacc8
  Michael Niedermayer authored Feb 25, 2014
```
* commit 'e7dfaf16':
  libavfilter: example audio filtering program

Conflicts:
	.gitignore
	configure
	doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  1f2bacc8
- avfilter/af_compand: fix invalid read · 9e329185
  Andrew Kelley authored Feb 25, 2014
```
Fixes #3383.
```
  9e329185
- Merge commit 'a1c69965' · 72d580f8
  Michael Niedermayer authored Feb 25, 2014
```
* commit 'a1c69965':
  parser: K&R formatting cosmetics

Conflicts:
	libavcodec/parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  72d580f8
- Merge commit 'ed61f3ca' · 03064364
  Michael Niedermayer authored Feb 25, 2014
```
* commit 'ed61f3ca':
  parser: Remove commented-out cruft
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  03064364
- mpegvideo: re-indent buffer clearing code · bc249bd6
  Hendrik Leppkes authored Feb 25, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  bc249bd6
- mpegvideo: fix overwriting hwaccel surface objects · fa84231e
  Hendrik Leppkes authored Feb 25, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  fa84231e
- parser: cosmetics: Drop some unnecessary parentheses · 4ec33648
  Diego Biurrun authored Feb 25, 2014
  
  4ec33648
- libavfilter: example audio filtering program · e7dfaf16
  Anton Khirnov authored Feb 13, 2014
```
Based on a patch by Andrew Kelley <superjoe30@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
```
  e7dfaf16
- avcodec/vp8dsp: use AV_ZERO64 to clear idct coefficient rows · bef6b27f
  Peter Ross authored Feb 25, 2014
```
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  bef6b27f
- parser: K&R formatting cosmetics · a1c69965
  Luca Barbato authored Feb 23, 2014
```
Signed-off-by: Diego Biurrun <diego@biurrun.de>
```
  a1c69965
- parser: Remove commented-out cruft · ed61f3ca
  Diego Biurrun authored Feb 25, 2014
  
  ed61f3ca
- Merge remote-tracking branch 'qatar/master' · a8ad7e47
  Michael Niedermayer authored Feb 25, 2014
```
* qatar/master:
  texi2pod: always declare the pod file as UTF-8 encoded

Conflicts:
	doc/texi2pod.pl
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  a8ad7e47
- lavu/buffer: add release function · 31444400
  Lukasz Marek authored Feb 23, 2014
```
new function allows to unref buffer and obtain its data.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  31444400
24 Feb, 2014 23 commits
- ffmpeg_opt: get_preset_file_2(): fix avio_open2() return code check · 774239be
  Timothy Gu authored Feb 24, 2014
```
avio_open2() only return < 0 when error.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  774239be
- texi2pod: always declare the pod file as UTF-8 encoded · 5ea14d48
  Janne Grunau authored Feb 24, 2014
  
  5ea14d48
- Merge remote-tracking branch 'qatar/master' · 75f6ed8d
  Michael Niedermayer authored Feb 24, 2014
```
* qatar/master:
  doc: fix one accented word
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  75f6ed8d
- Merge commit '48d1ed9c' · 26dad980
  Michael Niedermayer authored Feb 24, 2014
```
* commit '48d1ed9c':
  doc: name correct header

Conflicts:
	doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  26dad980
- Merge commit '39c2880e' · 6b06f9f1
  Michael Niedermayer authored Feb 24, 2014
```
* commit '39c2880e':
  af_volume: preserve frame properties

Conflicts:
	libavfilter/af_volume.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  6b06f9f1
- Merge commit 'dcc7e4bf' · fc10ed2c
  Michael Niedermayer authored Feb 24, 2014
```
* commit 'dcc7e4bf':
  af_resample: preserve frame properties
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  fc10ed2c
- Merge commit '67f2a688' · 70a25587
  Michael Niedermayer authored Feb 24, 2014
```
* commit '67f2a688':
  avconv: remove a write-only variable

Conflicts:
	ffmpeg.c
	ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  70a25587
- Merge commit '8aca00cc' · e66247e9
  Michael Niedermayer authored Feb 24, 2014
```
* commit '8aca00cc':
  libx265: Properly handled dynamic linking with MSVC

See: 87769d6cMerged-by: Michael Niedermayer <michaelni@gmx.at>
```
  e66247e9
- Merge commit '0f7fa48c' · e1991c7d
  Michael Niedermayer authored Feb 24, 2014
```
* commit '0f7fa48c':
  libx265: Support SAR

See: 73ee4cf3Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  e1991c7d
- Merge commit '2142b2ef' · 3d53bbd0
  Michael Niedermayer authored Feb 24, 2014
```
* commit '2142b2ef':
  libx265: Support 4:4:4

See: d102925aMerged-by: Michael Niedermayer <michaelni@gmx.at>
```
  3d53bbd0
- Merge commit 'd00a504b' · a88cbdfb
  Michael Niedermayer authored Feb 24, 2014
```
* commit 'd00a504b':
  libx265: Update API usage

Conflicts:
	libavcodec/libx265.c

See: d3736471Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  a88cbdfb
- avformat/options_table: add named constants for avoid_negative_ts · a908de7f
  Michael Niedermayer authored Feb 22, 2014
```
Idea-by: ubitux
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  a908de7f
- doc: fix one accented word · c91488ab
  Vittorio Giovara authored Feb 24, 2014
  
  c91488ab
- doc: name correct header · 48d1ed9c
  Vittorio Giovara authored Feb 24, 2014
  
  48d1ed9c
- af_volume: preserve frame properties · 39c2880e
  Anton Khirnov authored Feb 19, 2014
  
  39c2880e
- af_resample: preserve frame properties · dcc7e4bf
  Anton Khirnov authored Feb 19, 2014
  
  dcc7e4bf
- avconv: remove a write-only variable · 67f2a688
  Anton Khirnov authored Feb 19, 2014
  
  67f2a688
- libx265: Use proper error code · 6d18154f
  Derek Buitenhuis authored Feb 21, 2014
```
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
```
  6d18154f
- libx265: Properly handled dynamic linking with MSVC · 87769d6c
  Derek Buitenhuis authored Feb 21, 2014
```
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
```
  87769d6c
- libx265: Support SAR · 73ee4cf3
  Derek Buitenhuis authored Feb 21, 2014
```
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
```
  73ee4cf3
- libx265: Support 4:4:4 · d102925a
  Derek Buitenhuis authored Feb 21, 2014
```
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
```
  d102925a
- libx265: Update API usage · d3736471
  Derek Buitenhuis authored Feb 21, 2014
```
Framerate is now a sane rational instead of an integer, and
inputDepth is changed to what it actually is.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
```
  d3736471
- libx265: Properly handled dynamic linking with MSVC · 8aca00cc
  Derek Buitenhuis authored Feb 21, 2014
```
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
```
  8aca00cc