Commits · 707138593af5c4783035d0b9cc2d7c8cb2137dfa · Linshizhi / ffmpeg.wasm-core

04 Dec, 2011 21 commits

Merge remote-tracking branch 'qatar/master' · 70713859

Michael Niedermayer authored Dec 04, 2011

* qatar/master:
  adpcmenc: cosmetics: pretty-printing
  ac3dec: cosmetics: pretty-printing
  yuv4mpeg: cosmetics: pretty-printing
  shorten: remove dead initialization
  roqvideodec: set AVFrame reference before reget_buffer.
  bmp: fix some 1bit samples.
  latmdec: add fate test for audio config change
  oma: PCM support
  oma: better format detection with small probe buffer
  oma: clearify ambiguous if condition
  wavpack: Properly clip samples during lossy decode
  Code clean-up for crc.c, lfg.c, log.c, random_see.d, rational.c and tree.c.
  Cleaned pixdesc.c file in libavutil
  zmbv.c: coding style clean-up.
  xan.c: coding style clean-up.
  mpegvideo.c: code cleanup - first 500 lines.

Conflicts:
	Changelog
	libavcodec/adpcmenc.c
	libavcodec/bmp.c
	libavcodec/zmbv.c
	libavutil/log.c
	libavutil/pixdesc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

70713859

adpcmenc: cosmetics: pretty-printing · dc6d0430
Chris Berov authored Dec 02, 2011
```
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
```
dc6d0430
ac3dec: cosmetics: pretty-printing · 541d083a
Chris Berov authored Dec 02, 2011
```
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
```
541d083a
yuv4mpeg: cosmetics: pretty-printing · a4e21baa
Chris Berov authored Nov 30, 2011
```
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
```
a4e21baa
lavfi: add life source · 2f8b6e90
Stefano Sabatini authored Jun 26, 2011

2f8b6e90
aevalsrc: add duration option · 6c26fe8b
Stefano Sabatini authored Dec 02, 2011

6c26fe8b
shorten: remove dead initialization · eda87312
Paul B. Mahol authored Nov 29, 2011
```
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
```
eda87312
Microsoft Windows ICO demuxer · ba8410cb
Peter Ross authored Dec 04, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ba8410cb

roqvideodec: set AVFrame reference before reget_buffer. · 7679bd6e

Reimar Döffinger authored Nov 05, 2011

Otherwise it might return a write-only frame which would break
decoding completely.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

7679bd6e

bmp: fix some 1bit samples. · 1e92d58e

Carl Eugen Hoyos authored Nov 10, 2011

<= 8bpp BMP images always have palette.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

1e92d58e

latmdec: add fate test for audio config change · 8dd92eca
Janne Grunau authored Dec 02, 2011

8dd92eca

doc/filters.texi: Update drawtext docs so that the documented input... · b4425f26

Michael Niedermayer authored Dec 04, 2011

doc/filters.texi: Update drawtext docs so that the documented input width/height variables are compatible with qatar.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

b4425f26

vf_drawtext: support W/H parameters to reduce UI differences to qatar · dda3d716
Michael Niedermayer authored Dec 04, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
dda3d716
ffmpeg: select best pixel format for the encoder if no exact match. · 594090c6
Michael Niedermayer authored Dec 04, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
594090c6

oma: PCM support · c8b27a0e

David Goldwich authored Dec 02, 2011

Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

c8b27a0e

oma: better format detection with small probe buffer · 8ae5eb75

David Goldwich authored Dec 02, 2011

Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

8ae5eb75

oma: clearify ambiguous if condition · e9607007

David Goldwich authored Dec 02, 2011

Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

e9607007

vf_drawtext: cosmetics to reduce diff to qatar · f88d5df3
Michael Niedermayer authored Dec 04, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
f88d5df3
vf_drawtext: Add main_w/h to improve compatibility with the modified UI · 297422b3
Michael Niedermayer authored Dec 04, 2011
```
from the fork.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
297422b3
h264: show when has_b_frames is being increased. · fb266f59
Michael Niedermayer authored Dec 04, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
fb266f59

Merge remote-tracking branch 'qatar/master' · 7f92f3d8

Michael Niedermayer authored Dec 04, 2011

* qatar/master:
  h264: fix frame reordering code.
  fate: Add a test for the VBLE decoder
  doc: break some long lines in developer.texi
  drawtext: make x and y parametric
  drawtext: manage memory allocation better
  drawtext: refactor draw_text
  doc: remove space between variable and post increment in example code

Conflicts:
	doc/developer.texi
	doc/filters.texi
	libavcodec/h264.c
	libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

7f92f3d8

03 Dec, 2011 19 commits
- wavpack: Properly clip samples during lossy decode · a548b6cb
  Derek Buitenhuis authored Dec 03, 2011
```
When decoding lossy WavPack samples, they are supposed
to be clipped, in order to be decoded correctly.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
```
  a548b6cb
- Code clean-up for crc.c, lfg.c, log.c, random_see.d, rational.c and tree.c. · 425b45d4
  Yordan Makariev authored Dec 03, 2011
```
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
```
  425b45d4
- Cleaned pixdesc.c file in libavutil · 4a59eca9
  Tsvetelina Borisova authored Dec 03, 2011
```
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
```
  4a59eca9
- zmbv.c: coding style clean-up. · 8f8c785f
  Nathan Adil Maxson authored Dec 02, 2011
```
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
```
  8f8c785f
- xan.c: coding style clean-up. · 6eedeefe
  Nathan Adil Maxson authored Dec 02, 2011
```
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
```
  6eedeefe
- mpegvideo.c: code cleanup - first 500 lines. · 363114e8
  Konstantin Todorov authored Nov 30, 2011
```
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
```
  363114e8
- flvdec: Stop searching for streams once a audio & a video stream has been found · ff53c79d
  Michael Niedermayer authored Dec 03, 2011
```
instead of when the 2nd stream has been found.
This isnt ideal as we will likely still like before miss a data stream.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  ff53c79d
- Add forgotten %ifdef HAVE_AVX. · 85372f9d
  Reimar Döffinger authored Dec 03, 2011
```
Fixes compilation with older YASM/NASM versions.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
```
  85372f9d
- h264: fix frame reordering code. · adedd840
  Ronald S. Bultje authored Nov 30, 2011
```
Fixes fate-h264-conformance-{mr2_tandberg_e,mr3_tandberg_b} without
requiring -strict 1.
```
  adedd840
- lavu/error: define AVERROR_BUG. · 976b0959
  Nicolas George authored Dec 03, 2011
```
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  976b0959
- avutil: av_x_if_null: remove const for the return value. · 757cb3b4
  Nicolas George authored Dec 03, 2011
```
This is the usual weirdness with const/non-const pointers through a function.
See the prototype of strchr for a standard example.

The function had to be moved down, below the point where stdint.h is
indirectly included.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  757cb3b4
- ffmpeg: use standard duration calculation code in the stream copy case. · 730945d9
  Michael Niedermayer authored Dec 03, 2011
```
Fixes a.mkv non monotonic timestamps
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  730945d9
- BMP: Support BMP OS/2 v2 with RLE compression. · 28a11a67
  ami_stuff authored Dec 03, 2011
```
Fixes ticket #699.

Patch also provided by Peter Ross.
```
  28a11a67
- Allow last mov chunk to have an arbitrary number of samples. · 8dcd2a41
  Carl Eugen Hoyos authored Dec 03, 2011
```
Fixes ticket #673.
```
  8dcd2a41
- Support decoding right-to-left targa files. · 88bbabcc
  Carl Eugen Hoyos authored Dec 03, 2011
```
Fixes ticket #698.
```
  88bbabcc
- celtdec: adapt to avcodec_decode_audio4. · 90bfd511
  Nicolas George authored Dec 03, 2011
```
Original fix by Michael Niedermayer.
Slightly modified to avoid the now redundant multiplications
and divisions in the main code path.
```
  90bfd511
- oma: Fix out of array read. · a930cd0d
  Michael Niedermayer authored Dec 03, 2011
```
Input: 01-Untitled-partial.oma
ZZUF params: zzuf[s=7157,r=0.001]

Bug-found-by: darkshikari
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  a930cd0d
- id3v2: Fix null ptr crash in get_extra_meta_func() · aedd30b6
  Michael Niedermayer authored Dec 03, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  aedd30b6
- zmbv: fix 2 memleaks · 8bd2b27f
  Michael Niedermayer authored Dec 03, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  8bd2b27f