Commits · c7c976c6d7051804f96e3106688c1963d1238ae0 · Linshizhi / ffmpeg.wasm-core

17 Apr, 2012 16 commits

oggdec: Safety check against stream counts being inconsistent in seek() · c7c976c6
Michael Niedermayer authored Apr 17, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
c7c976c6

oggdec: Recreate streams only in the 1 stream case. · 9bb3b7d0

Michael Niedermayer authored Apr 17, 2012

Other cases are not supported and lead to inconsistencies which
can lead to out of array writes.
Reported-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

9bb3b7d0

Merge remote-tracking branch 'qatar/master' · 15141f93

Michael Niedermayer authored Apr 17, 2012

* qatar/master:
  indeo3: add parens around some macro arguments
  h264: use proper PROLOGUE statement for a function using 8 registers.
  doc: Update sample Vim config with suitable (function) indentation settings.
  dv: Merge dvquant.h into dvdata.c where all other DV tables reside.
  dv: Move static tables only used in one place to where they are used.
  graphparser: set next to NULL on an entry extracted from inputs list
  doc/filters: update documentation.
  avconv: flush decoders immediately after an EOF.
  avconv: send EOF to vsrc_buffer.
  avconv: reindent.

Conflicts:
	doc/filters.texi
	ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

15141f93

fate: libavutil tests do not require SAMPLES. · 68ca49dc
Nicolas George authored Apr 16, 2012

68ca49dc
parseutils: include errors in test output. · b0e7321c
Nicolas George authored Apr 16, 2012

b0e7321c
ffmpeg: make max frames work again, after merge · 788a60d9
Michael Niedermayer authored Apr 17, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
788a60d9

vf_thumbnail: colorspace changed from yv12 to rgb · 56b9d9b5

Michael Niedermayer authored Apr 17, 2012

Not fully investigated but thumbnail supports rgb and not yv12 so
this is better ...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

56b9d9b5

fate: fix vp8 size change regression · 9bf41341
Michael Niedermayer authored Apr 17, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
9bf41341
vsrc_buffer: fix null ptr segfault · 5cd460ba
Michael Niedermayer authored Apr 17, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
5cd460ba

avfiltergraph: More advanced heuristic to select colorspace. · 0d115d77

Michael Niedermayer authored Apr 17, 2012

This fixes regressions caused by switching from ffmpegs system to avfilters.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

0d115d77

fate: gif: change checksum to bgr8 from rgb8 as thats what gets selected now · 128fa129
Michael Niedermayer authored Apr 17, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
128fa129
imgconvert: fix regression with fate-gif colorspaces. · 84cd3729
Michael Niedermayer authored Apr 17, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
84cd3729
ffmpeg: fix regression with jpeg pix fmts · 052ab208
Michael Niedermayer authored Apr 17, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
052ab208
ffmpeg: fix regression with png · 89f86379
Michael Niedermayer authored Apr 17, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
89f86379
ffmpeg: choose_pix_fmt: pass target fmt in · 8a28fa01
Michael Niedermayer authored Apr 17, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
8a28fa01

Merge commit '' · 47787831

Michael Niedermayer authored Apr 17, 2012

* commit '3b266da3':
  avconv: add support for complex filtergraphs.
  avconv: make filtergraphs global.
  avconv: move filtered_frame from InputStream to OutputStream.
  avconv: don't set output width/height directly from input value.
  avconv: move resample_{width,height,pix_fmt} to InputStream.
  avconv: remove a useless variable from OutputStream.
  avconv: get output pixel format from lavfi.
  graphparser: fix the order in which unlabeled input links are returned.
  avconv: change {input,output}_{streams,files} into arrays of pointers.
  avconv: don't pass input/output streams to some functions.

Conflicts:
	cmdutils.c
	cmdutils.h
	doc/ffmpeg.texi
	ffmpeg.c
	ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

47787831

16 Apr, 2012 24 commits

matroskadec: use av_grow_packet in merge_packets. · dcd207c4
Nicolas George authored Apr 16, 2012
```
It ensures that the packet is properly padded
and makes the code simpler.

Fixes trac ticket #1223.
```
dcd207c4

mem.c: fix wrong comment. · 1a65d50e

Reimar Döffinger authored Apr 15, 2012

Overwriting the av_malloc etc. functions is not easily
possible anymore, even for systems that support overriding
symbols in shared libraries in principle.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

1a65d50e

Respect -copyinkf for subtitles. · 071292b8

Reimar Döffinger authored Apr 15, 2012

Necessary to make it possible to copy teletext streams
(trac issue #531).
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

071292b8

Add skip_to_keyframe stream variable. · 4a95876f

Reimar Döffinger authored Apr 13, 2012

This replaces the matroskadec one with the same name.
The advantage is not only easier reuse in other demuxers
but also that we can make the decisions after the parser.
This fixes seeking in files that mark the keyframes incorrectly,
for example the file in track ticket #1003.
The matroska variable is still kept to be able to complain
about such broken files.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

4a95876f

svq3: check the watermark height. · 4fa706a4

Michael Niedermayer authored Apr 16, 2012

Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

4fa706a4

diracdec: check lowdelay bytes. · efe1ba72

Michael Niedermayer authored Apr 16, 2012

Fixes division by zero

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

efe1ba72

omadec: make sample rate table large enough to prevent out of array reading. · a30165c4

Michael Niedermayer authored Apr 16, 2012

The new values lead to error messages when used

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

a30165c4

g729dec: initialize pitch_delay_int_prev to the minimum valid value. · c963189b

Michael Niedermayer authored Apr 16, 2012

This prevents an out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

c963189b

indeo3: add parens around some macro arguments · 8b84e082

Mans Rullgard authored Apr 16, 2012

Without these, the expansion contains things like --1 with
some compilers resulting in build errors.
Signed-off-by: Mans Rullgard <mans@mansr.com>

8b84e082

h264: use proper PROLOGUE statement for a function using 8 registers. · 87a24634
Ronald S. Bultje authored Apr 15, 2012
```
Fixes crashes when using biweight on win64.
```
87a24634

loco: fix 10l typo (missing case) · 31a45014

Michael Niedermayer authored Apr 16, 2012

Found-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

31a45014

dsicinav: Check for overread in RLE decode. · 47f0bead

Michael Niedermayer authored Apr 16, 2012

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

47f0bead

smacker: Check get_vlc() return values. · 71d3c25a

Michael Niedermayer authored Apr 16, 2012

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

71d3c25a

dcadec: fix global array overread. · 8e77c384

Michael Niedermayer authored Apr 16, 2012

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

8e77c384

Support decoding LOCO_CRGBA. · bdeb54e1
Carl Eugen Hoyos authored Apr 16, 2012
```
Fixes a part of ticket #1222.
```
bdeb54e1

indeo4: avoid storing invalid values in quant_mat. · 884efd4e

Michael Niedermayer authored Apr 16, 2012

Fixes a global array overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

884efd4e

4xmdemux: Check chunk size · 474e31c9

Michael Niedermayer authored Apr 16, 2012

Fixes over reading the header array

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

474e31c9

omadec: check GEOB sizes against buffer size · e74fa25c

Michael Niedermayer authored Apr 16, 2012

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

e74fa25c

vc1dec: add missing terminating element to mpeg4_video_profiles · a10f71c1
Michael Niedermayer authored Apr 16, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
a10f71c1

vc1dec: check end_mb_y / start_mb_y validity · e985cfd1

Michael Niedermayer authored Apr 16, 2012

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

e985cfd1

flvdec: allocate large enough buffer so get_bits() doesnt overread · c4ce8709
Michael Niedermayer authored Apr 16, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
c4ce8709
ffv1: attempt to workaround intel CC fate issue. · fa1b2c8e
Michael Niedermayer authored Apr 16, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
fa1b2c8e
doc: Update sample Vim config with suitable (function) indentation settings. · b553a425
Diego Biurrun authored Feb 28, 2012

b553a425
dv: Merge dvquant.h into dvdata.c where all other DV tables reside. · a3dbd459
Diego Biurrun authored Apr 04, 2012

a3dbd459