Commits · 3ba056017f978ba69ea933c593f0e616b3632261 · Linshizhi / ffmpeg.wasm-core

27 Feb, 2014 7 commits

Carl Eugen Hoyos authored Feb 26, 2014

Add parenthesis around "MD5" in the request string as required by
RFC 2069.

Fixes ticket #3417.

Reported and tested by Haarman
Analyzed-by: Eugen-Andrei Gavriloaie

3ba05601

avcodec/h264: allow mixing idr and non idr slices with frame threading again · 4f4cc43f
Michael Niedermayer authored Feb 27, 2014
```
This combination exists in the wild
Fixes Ticket3131
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
4f4cc43f
avformat/mov: simplify code setting needs_parsing · 622d24e4
Michael Niedermayer authored Feb 27, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
622d24e4
avcodec/h264_refs: remove lost frames instead of disfavoring them · 649686d8
Michael Niedermayer authored Feb 27, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
649686d8

Merge remote-tracking branch 'qatar/master' · 33a2b45c

Michael Niedermayer authored Feb 27, 2014

* qatar/master:
  af_compand: add a dependency on strtok_r

Conflicts:
	configure

Not merged as FFmpegs compand filter does not depend on strtok_r
Merged-by: Michael Niedermayer <michaelni@gmx.at>

33a2b45c

avcodec/h264: fix droped frame handling also for threads > 1 · 64bb64f7

Michael Niedermayer authored Feb 27, 2014

Seems i mistakely tested just with threads=1
Fixes part of Ticket3386
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

64bb64f7

avcodec/h264: avoid using lost frames as references · b5005def
Michael Niedermayer authored Feb 27, 2014
```
Fixes Ticket3386
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
b5005def

26 Feb, 2014 25 commits
- Merge remote-tracking branch 'qatar/master' · c4c5351f
  Michael Niedermayer authored Feb 26, 2014
```
* qatar/master:
  build: Do not redundantly specifiy H.263-related object files for MSMPEG4v*
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  c4c5351f
- af_compand: add a dependency on strtok_r · 291e49d4
  Anton Khirnov authored Feb 26, 2014
  
  291e49d4
- build: Do not redundantly specifiy H.263-related object files for MSMPEG4v* · a63ac110
  Diego Biurrun authored Feb 19, 2014
```
These are already covered through dependencies specified in configure.
```
  a63ac110
- libavcodec/rawdec: avoid memcpy when performing 16-bit samples shift · 1524b0fa
  Peter Ross authored Feb 26, 2014
```
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  1524b0fa
- configure: use pkg-config to detect libbluray · baa650cc
  Timothy Gu authored Feb 24, 2014
```
The current configure fails when static libbluray is compiled with libxml2
support.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  baa650cc
- avcodec/parser: put lost comments back · bdadf05e
  Michael Niedermayer authored Feb 26, 2014
```
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  bdadf05e
- avformat/sdr2: h264 stream needs parsing · 9d297641
  Paul B Mahol authored Feb 26, 2014
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  9d297641
- avfilter: remove superflous lines · 9f2a3bce
  Paul B Mahol authored Feb 26, 2014
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  9f2a3bce
- avfilter/af_compand: some more cosmetics to decrease difference with qatar · a2e4b4e9
  Paul B Mahol authored Feb 26, 2014
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  a2e4b4e9
- avfilter: remove af_compand_fork · 8f946ac8
  Michael Niedermayer authored Feb 26, 2014
```
All relevant changes except the float/double one have been merged
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  8f946ac8
- avfilter/af_compand: more cosmetics from libavfilter/af_compand_fork.c · c62d83a5
  Michael Niedermayer authored Feb 26, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  c62d83a5
- avfilter/af_compand: cosmetics from libavfilter/af_compand_fork.c · 05412f4c
  Michael Niedermayer authored Feb 26, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  05412f4c
- avfilter/af_compand: switch defaults to libavfilter/af_compand_fork.c · 5e02ff3e
  Michael Niedermayer authored Feb 26, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  5e02ff3e
- avfilter/af_compand: "use local variable for channels" from libavfilter/af_compand_fork.c · 619d6b8f
  Michael Niedermayer authored Feb 26, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  619d6b8f
- avfilter/af_compand: error checks from libavfilter/af_compand_fork.c · e509df4b
  Michael Niedermayer authored Feb 26, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  e509df4b
- avfilter/af_compand: pts init code from libavfilter/af_compand_fork.c · 4b879751
  Michael Niedermayer authored Feb 26, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  4b879751
- avfilter/af_compand: cosmetics and doxy comment from libavfilter/af_compand_fork.c · 5c78fe08
  Michael Niedermayer authored Feb 26, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  5c78fe08
- avfilter/af_compand: add Andrew Kelley to the copyright · 66ad3292
  Michael Niedermayer authored Feb 26, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  66ad3292
- avfilter/af_compand: merge avframe code from af_compand_fork · 86a191e2
  Michael Niedermayer authored Feb 26, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  86a191e2
- avfilter/af_compand: merge uninit() calls on error from af_compand_fork.c · 27ba05ad
  Michael Niedermayer authored Feb 26, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  27ba05ad
- avfilter/af_compand: also support '|' as seperator · 8b804859
  Michael Niedermayer authored Feb 26, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  8b804859
- avfilter/af_compand_fork: avoid strtok_r() so as not to break build · 1df1a1fe
  Michael Niedermayer authored Feb 26, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  1df1a1fe
- avfilter/af_compand: whitespace changes from af_compand_fork · 22307f17
  Michael Niedermayer authored Feb 26, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  22307f17
- 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 8 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