Commits · a696b0917d1d1ef5b0dee691786ddb51ee4ab519 · Linshizhi / ffmpeg.wasm-core

28 Mar, 2014 9 commits

Michael Niedermayer authored Mar 28, 2014

* commit 'fb5cf145':
  bmp: add a standalone parser

Conflicts:
	Changelog
	libavcodec/bmp_parser.c
	libavcodec/version.h

See: 011ce89d and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

a696b091

Merge commit '' · 2b570c95

Michael Niedermayer authored Mar 28, 2014

* commit '991362fa':
  fate: add XBM tests

Conflicts:
	tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2b570c95

avcodec/xbmdec: support X10 format · 1da18667
Michael Niedermayer authored Mar 28, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
1da18667
avcodec/xbmdec: merge ptr increase into dereference · 4618084a
Michael Niedermayer authored Mar 28, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
4618084a

Merge commit '' · 296e63ef

Michael Niedermayer authored Mar 28, 2014

* commit '678082b4':
  X-Bitmap decoder

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/version.h
	libavcodec/xbmdec.c

See: a0340dfbMerged-by: Michael Niedermayer <michaelni@gmx.at>

296e63ef

Merge commit '' · 6bd05ed8

Michael Niedermayer authored Mar 28, 2014

* commit '792e4c21':
  xbm: use av_frame_free on close

Conflicts:
	libavcodec/xbmenc.c

No change as the buggy code is not part of FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

6bd05ed8

Merge commit '' · 8a8472dd

Michael Niedermayer authored Mar 28, 2014

* commit 'a7a5e385':
  fate: add PAF audio and video tests

Conflicts:
	tests/fate/audio.mak
	tests/fate/video.mak

See: 101615c7
See: 409cc458Merged-by: Michael Niedermayer <michaelni@gmx.at>

8a8472dd

Merge commit '' · 16ddc58b

Michael Niedermayer authored Mar 28, 2014

* commit '70daeacd':
  PAF demuxer and decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/paf.c
	libavcodec/version.h
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/paf.c
	libavformat/version.h

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

16ddc58b

Merge commit '' · 03e4c2d8

Michael Niedermayer authored Mar 28, 2014

* commit 'd37c9621':
  lavc: restore copy_block{4,16} functions

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

03e4c2d8

27 Mar, 2014 26 commits
- dshow: show device name when outputting buffer overflow log message · 773eb74b
  rogerdpack authored Mar 27, 2014
```
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  773eb74b
- bmp: add a standalone parser · fb5cf145
  Paul B Mahol authored Aug 05, 2012
```
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
```
  fb5cf145
- avcodec/libx264: move where x264opts is applied down so it isnt overridden by avctx & defaults · 64b79141
  Michael Niedermayer authored Mar 27, 2014
```
fixes x264opts opengop=1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  64b79141
- fate: add XBM tests · 991362fa
  Vittorio Giovara authored Mar 17, 2014
  
  991362fa
- X-Bitmap decoder · 678082b4
  Vittorio Giovara authored Mar 22, 2014
  
  678082b4
- xbm: use av_frame_free on close · 792e4c21
  Vittorio Giovara authored Mar 17, 2014
  
  792e4c21
- fate: add PAF audio and video tests · a7a5e385
  Paul B Mahol authored Jul 08, 2012
```
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
```
  a7a5e385
- PAF demuxer and decoder · 70daeacd
  Paul B Mahol authored Mar 21, 2014
```
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
```
  70daeacd
- lavc: restore copy_block{4,16} functions · d37c9621
  Vittorio Giovara authored Mar 10, 2014
```
They were removed in 9e31729d.
```
  d37c9621
- x86: convert DNxHDenc inline asm to yasm · 9d34dce0
  Timothy Gu authored Mar 27, 2014
```
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  9d34dce0
- dnxhdenc: make get_pixel_8x4_sym accept ptrdiff_t as stride · cb11b9e8
  Timothy Gu authored Mar 27, 2014
```
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  cb11b9e8
- avcodec: Make ff_print_debug_info2() independant of Picture struct · 72bff8da
  Michael Niedermayer authored Mar 27, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  72bff8da
- avcodec/brenderpix: propagate error codes · a4f27a3f
  Michael Niedermayer authored Mar 27, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  a4f27a3f
- avcodec/brenderpix: remove unused variable · 85064233
  Michael Niedermayer authored Mar 27, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  85064233
- Merge remote-tracking branch 'qatar/master' · 09ebd87a
  Michael Niedermayer authored Mar 27, 2014
```
* qatar/master:
  fate: add BRender PIX tests

Conflicts:
	tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  09ebd87a
- Merge commit 'ae17878f' · f392949f
  Michael Niedermayer authored Mar 27, 2014
```
* commit 'ae17878f':
  BRender PIX image decoder

Conflicts:
	doc/general.texi
	libavcodec/Makefile
	libavcodec/version.h

See: 492a5f83, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  f392949f
- Merge commit 'c3a0b3eb' · 68014c6e
  Michael Niedermayer authored Mar 27, 2014
```
* commit 'c3a0b3eb':
  arm: build: Maintain decoder objects separate from infrastructure objects

Conflicts:
	libavcodec/arm/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  68014c6e
- fate: add BRender PIX tests · bb36b9aa
  Vittorio Giovara authored Mar 26, 2014
  
  bb36b9aa
- BRender PIX image decoder · ae17878f
  Aleksi Nurmi authored Mar 26, 2014
```
Further enhancements by Vittorio Giovara and Paul B Mahol.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
```
  ae17878f
- arm: build: Maintain decoder objects separate from infrastructure objects · c3a0b3eb
  Diego Biurrun authored Mar 27, 2014
  
  c3a0b3eb
- avcodec/vp7: Fix null pointer dereference in vp7_decode_frame_header() · 57e939d9
  Michael Niedermayer authored Mar 27, 2014
```
This simply copies the "interframe without a prior keyframe" check
thats done later into vp7_decode_frame_header()
Found-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  57e939d9
- configure: fix VP7 standalone build · d5c9843c
  Michael Niedermayer authored Mar 27, 2014
```
Found-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  d5c9843c
- Fix spelling errors in texi files: more informations --> more information... · d473f2d1
  Andreas Cadhalpun authored Mar 26, 2014
```
Fix spelling errors in texi files: more informations --> more information allows to --> allows one to
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  d473f2d1
- Fix texinfo error due to wrong @subsubsection · cf3bfc97
  Andreas Cadhalpun authored Mar 26, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  cf3bfc97
- Merge remote-tracking branch 'qatar/master' · 62094e2f
  Michael Niedermayer authored Mar 27, 2014
```
* qatar/master:
  fate: add Alias PIX tests

Conflicts:
	tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  62094e2f
- Merge commit 'e50f5d3c' · 12ab07be
  Michael Niedermayer authored Mar 27, 2014
```
* commit 'e50f5d3c':
  Alias PIX image encoder and decoder

Conflicts:
	Changelog
	libavcodec/allcodecs.c
	libavcodec/version.h
	libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  12ab07be
26 Mar, 2014 5 commits
- libavformat/aviobuf: keep track of the original buffer-size and restore it... · 61b5ef77
  Michael Niedermayer authored Mar 26, 2014
```
libavformat/aviobuf: keep track of the original buffer-size and restore it after probe/ensure-seekback
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  61b5ef77
- avformat/aviobuf: ffio_ensure_seekback: only copy the initialized part of the buffer · 0d4a66ee
  Michael Niedermayer authored Mar 26, 2014
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  0d4a66ee
- fate: add Alias PIX tests · 9718c31e
  Vittorio Giovara authored Mar 20, 2014
  
  9718c31e
- Alias PIX image encoder and decoder · e50f5d3c
  Vittorio Giovara authored Mar 20, 2014
  
  e50f5d3c
- Merge remote-tracking branch 'qatar/master' · 50b68e32
  Michael Niedermayer authored Mar 26, 2014
```
* qatar/master:
  truehd: add hand-scheduled ARM asm version of ff_mlp_pack_output.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  50b68e32