Commits · 43dec5ef9a360c9ffac3278f464832bd99af0cb0 · Linshizhi / ffmpeg.wasm-core

13 Oct, 2013 13 commits

Merge remote-tracking branch 'qatar/master' · 43dec5ef

Michael Niedermayer authored Oct 13, 2013

* qatar/master:
  indeo4: Check the inherited quant_mat

Conflicts:
	libavcodec/indeo4.c

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

43dec5ef

Merge commit '' · d3850ac5

Michael Niedermayer authored Oct 13, 2013

* commit '0cb83c56':
  indeo4: Check the block size if reusing the band configuration

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

d3850ac5

Merge commit '' · 0c7bd340

Michael Niedermayer authored Oct 13, 2013

* commit 'fd2384f0':
  oggparsevorbis: fail on memory allocation error
Merged-by: Michael Niedermayer <michaelni@gmx.at>

0c7bd340

Merge commit '' · 77caa31f

Michael Niedermayer authored Oct 13, 2013

* commit 'c18375ec':
  oggvorbisdec: add support for embedded cover art

Conflicts:
	libavformat/oggparsevorbis.c

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

77caa31f

Merge commit '' · 92b03cf9

Michael Niedermayer authored Oct 13, 2013

* commit '601d6228':
  flac: move picture parsing code in a separate file

Conflicts:
	libavformat/Makefile
	libavformat/flacdec.c

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

92b03cf9

Merge commit '' · 8dbf98e6

Michael Niedermayer authored Oct 13, 2013

* commit 'ecab1c77':
  oggdec: add support for Opus in Ogg demuxing

Conflicts:
	Changelog
	libavformat/oggparseopus.c
	libavformat/version.h

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

8dbf98e6

Merge commit '' · 3ce0edde

Michael Niedermayer authored Oct 13, 2013

* commit 'ed9245db':
  oggparsevorbis: check allocations

Conflicts:
	libavformat/oggparsevorbis.c

See: 033f1644
See: 84aea80fMerged-by: Michael Niedermayer <michaelni@gmx.at>

3ce0edde

Merge commit '' · b6ffe8af

Michael Niedermayer authored Oct 13, 2013

* commit '9c15ef35':
  oggparsevorbis: support official chapter extension

Conflicts:
	libavformat/oggparsevorbis.c

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

b6ffe8af

Merge commit '' · 40ade071

Michael Niedermayer authored Oct 13, 2013

* commit '16ea20c8':
  lavc doxy: extend/clarify avcodec_decode_audio4() doxy
Merged-by: Michael Niedermayer <michaelni@gmx.at>

40ade071

Merge commit '' · 29d64b1d

Michael Niedermayer authored Oct 13, 2013

* commit '66d3f5fd':
  lavc doxy: remove false statements about alignment requirements.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

29d64b1d

Merge commit '' · b35ef855

Michael Niedermayer authored Oct 13, 2013

* commit '364af376':
  FATE: add lavr resampling tests

The tests do not pass, and thus where disabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>

b35ef855

Merge commit '' · de80cebd

Michael Niedermayer authored Oct 13, 2013

* commit '9ab5f710':
  FATE: add lavr mixing tests

The tests do not pass, and thus where disabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>

de80cebd

Merge commit '' · 830a567e

Michael Niedermayer authored Oct 13, 2013

* commit 'df6737a5':
  audio_mix: fix channel order in mix_1_to_2_fltp_flt_c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

830a567e

12 Oct, 2013 27 commits
- indeo4: Check the inherited quant_mat · c9ef6b09
  Luca Barbato authored Oct 11, 2013
```
Invalidate it if not supported.

Sample-Id: 00000262-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
```
  c9ef6b09
- indeo4: Check the block size if reusing the band configuration · 0cb83c56
  Luca Barbato authored Oct 11, 2013
```
Sample-Id: 00000287-google

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
```
  0cb83c56
- lavc: rename h265 to hevc, add AV_CODEC_ID_H265 with identical value for backward compatibility · 87fe0bbd
  Michael Niedermayer authored Oct 12, 2013
```
Somehow 2 different identifiers have come into existence which makes supporting
both until the next major version bump required
I did not investigate how exactly that did happen.

wm4, j-b and smarter prefer hevc.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  87fe0bbd
- avformat/avr: use ff_get_pcm_codec_id() · fd54f700
  Paul B Mahol authored Oct 12, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  fd54f700
- avfilter/vsrc_testsrc: smpte(hd)bars: use yuv directly · cfc9a4c7
  Paul B Mahol authored Oct 12, 2013
```
Also set color space.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  cfc9a4c7
- avfilter/vf_separatefields: do not reset pts to 0 · 1d8ce109
  Paul B Mahol authored Oct 12, 2013
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
  1d8ce109
- oggparsevorbis: fail on memory allocation error · fd2384f0
  Vittorio Giovara authored Oct 12, 2013
  
  fd2384f0
- oggvorbisdec: add support for embedded cover art · c18375ec
  James Almer authored Jul 09, 2013
```
Signed-off-by: James Almer <jamrial@gmail.com>
```
  c18375ec
- flac: move picture parsing code in a separate file · 601d6228
  James Almer authored Jul 09, 2013
```
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
```
  601d6228
- oggdec: add support for Opus in Ogg demuxing · ecab1c77
  Nicolas George authored Jun 24, 2012
  
  ecab1c77
- oggparsevorbis: check allocations · ed9245db
  Vittorio Giovara authored Oct 05, 2013
```
Signed-off-by: Anton Khirnov <anton@khirnov.net>
```
  ed9245db
- oggparsevorbis: support official chapter extension · 9c15ef35
  James Almer authored Oct 05, 2013
```
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
```
  9c15ef35
- lavc doxy: extend/clarify avcodec_decode_audio4() doxy · 16ea20c8
  Anton Khirnov authored Oct 08, 2013
```
Elaborate on flushing the decoder.
```
  16ea20c8
- lavc doxy: remove false statements about alignment requirements. · 66d3f5fd
  Anton Khirnov authored Oct 08, 2013
```
The packet data does not need to be aligned.
```
  66d3f5fd
- FATE: add lavr resampling tests · 364af376
  Anton Khirnov authored Sep 30, 2013
  
  364af376
- FATE: add lavr mixing tests · 9ab5f710
  Anton Khirnov authored Sep 30, 2013
  
  9ab5f710
- audio_mix: fix channel order in mix_1_to_2_fltp_flt_c · df6737a5
  Anton Khirnov authored Oct 02, 2013
```
CC:libav-stable@libav.org
```
  df6737a5
- Merge remote-tracking branch 'lukaszmluki/master' · 8de021fa
  Michael Niedermayer authored Oct 12, 2013
```
* lukaszmluki/master:
  avformat/ftp: add log regarding passive mode failure
  avformat/ftp: fix possible deadlock
  avdevice/pulse_audio_enc: fix stream index
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  8de021fa
- Merge remote-tracking branch 'qatar/master' · 23c8a335
  Michael Niedermayer authored Oct 12, 2013
```
* qatar/master:
  riff: Add a mapping for VP6A
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
  23c8a335
- avformat/ftp: add log regarding passive mode failure · 3a92ee59
  Lukasz Marek authored Oct 12, 2013
```
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
```
  3a92ee59
- avformat/ftp: fix possible deadlock · e1fb3143
  Lukasz Marek authored Oct 12, 2013
```
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
```
  e1fb3143
- avdevice/pulse_audio_enc: fix stream index · 7b1640c4
  Lukasz Marek authored Oct 12, 2013
```
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
```
  7b1640c4
- riff: Add a mapping for VP6A · a52b5a5a
  Martin Storsjö authored Aug 14, 2013
```
This allows demuxing VP6A from F4V files.
Signed-off-by: Martin Storsjö <martin@martin.st>
```
  a52b5a5a
- avfilter/lavfutils: fix memleak of avpacket · aeddc6e3
  Michael Niedermayer authored Oct 12, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  aeddc6e3
- avfilter/vf_removelogo: fix pixel pointer so it points where its intended · eedfee12
  Michael Niedermayer authored Oct 12, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  eedfee12
- avfilter/vf_removelogo: fix offset for accessing pixels above and below · 8c582d1b
  Michael Niedermayer authored Oct 12, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  8c582d1b
- avfilter/vf_removelogo: use av_freep() for saftey · 8c0687ab
  Michael Niedermayer authored Oct 12, 2013
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  8c0687ab