Commits · 53b6503184a9403e9ac7eb77a35059be64a308b0 · Linshizhi / ffmpeg.wasm-core

17 Dec, 2011 3 commits

Michael Niedermayer authored Dec 17, 2011

Bug found by: Rik Maes <rik.maes54@gmail.com>
Change based on suggestion by Rik Maes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

53b65031

atrac3: Fix crash in tonal component decoding. · 9af6abdc
Michael Niedermayer authored Dec 17, 2011
```
Fixes Ticket780
Bug Found by: cosminamironesei
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
9af6abdc

Merge remote-tracking branch 'qatar/master' · 552ec4c9

Michael Niedermayer authored Dec 17, 2011

* qatar/master:
  get_bits: remove A32 variant
  avconv: support stream specifiers in -metadata and -map_metadata
  wavpack: Fix 32-bit clipping
  wavpack: Clip samples after shifting
  h264: don't drop B-frames after next keyframe on POC reset.
  get_bits: remove useless pointer casts
  configure: refactor lists of tests and components into variables
  rv40: NEON optimised weak loop filter
  mpegts: replace some magic numbers with the existing define
  swscale: add unscaled packed 16 bit per component endianess conversion

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

552ec4c9

16 Dec, 2011 36 commits

get_bits: remove A32 variant · a1e98f19

Mans Rullgard authored Dec 16, 2011

The A32 bitstream reader variant is only used on ARMv5 and for
Prores due to the larger bit cache this decoder requires.

In benchmarks on ARMv5 (Marvell Sheeva) with gcc 4.6, the only
statistically significant difference between ALT and A32 is
a 4% advantage for ALT in FLAC decoding.  There is thus no (longer)
any reason to keep the A32 reader from this point of view.

This patch adds an option to the ALT reader increasing the bit
cache to 32 bits as required by the Prores decoder.  Benchmarking
shows no significant change in speed on Intel i7.  Again, the
A32 reader fails to justify its existence.
Signed-off-by: Mans Rullgard <mans@mansr.com>

a1e98f19

avconv: support stream specifiers in -metadata and -map_metadata · a7b5e841
Alexandra Khirnova authored Dec 13, 2011
```
Signed-off-by: Anton Khirnov <anton@khirnov.net>
```
a7b5e841

wavpack: Fix 32-bit clipping · bb9747c8

Derek Buitenhuis authored Dec 16, 2011

In the case that (frame_flags & 0x03) == 3, hybrid_maxclip
may have had a signed integer overflow.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

bb9747c8

wavpack: Clip samples after shifting · 365e1ec2

Derek Buitenhuis authored Dec 16, 2011

It doesn't make much sense to clip pre-shift,
nor is it correct for proper decoding.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

365e1ec2

CODEC_ID_SOL_DPCM: Fix used write buffer. · 6d8e6fe9
Michael Niedermayer authored Dec 16, 2011
```
Bug found by: Oana Stratulat
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
6d8e6fe9

h264: don't drop B-frames after next keyframe on POC reset. · 0b4c3232

Ronald S. Bultje authored Dec 12, 2011

The keyframe after a POC reset may not be the first to be returned to
the user. Therefore, don't reset the expected next POC once we return
a keyframe to the user, but once we know that the next frame in the
return-queue is a keyframe.

0b4c3232

cljr: Check if width or height are positive integers · 4af0262f

Shitiz Garg authored Dec 15, 2011

width and height might get passed as 0 and would cause floating point
exceptions in decode_frame.
Fixes bugzilla #149
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

4af0262f

ffmpeg: Fix killing [Y/n] prompt with ctrl-c · 7b92863f
Michael Niedermayer authored Dec 16, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
7b92863f
ffmpeg: exit() on repeated ctrl-c · cf7076ee
Michael Niedermayer authored Dec 16, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
cf7076ee
h264: return the consumed amountg in case of Q264 · 3d07e0ab
Michael Niedermayer authored Dec 16, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
3d07e0ab
h264: retuen the amount read in case of NAL_END_SEQUENCE · 22796042
Michael Niedermayer authored Dec 16, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
22796042
h264: reset nal_unit_type so that decoding frames without any nal units · 902c0904
Michael Niedermayer authored Dec 16, 2011
```
dont leave its value at something random.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
902c0904
mtvdemuxer: fix segfault caused by truncated packets. · f890cb94
Michael Niedermayer authored Dec 16, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
f890cb94
lavf: print an error if a packet has been truncated due to filesize · ee181f84
Michael Niedermayer authored Dec 16, 2011
```
in av_get_packet()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
ee181f84
txd/westwood: remove demuxer specific overallocate solutions as the new generic code · 207d9eab
Michael Niedermayer authored Dec 16, 2011
```
handles it fine.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
207d9eab
lavf: Update AVIOContext.maxsize when hitting the end. · 559ae20d
Michael Niedermayer authored Dec 16, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
559ae20d

get_bits: remove useless pointer casts · b8909cb3

Mans Rullgard authored Dec 16, 2011

These pointers are already of the correct type.
Signed-off-by: Mans Rullgard <mans@mansr.com>

b8909cb3

configure: refactor lists of tests and components into variables · 54e75be4
Diego Biurrun authored Sep 12, 2011

54e75be4
rv40: NEON optimised weak loop filter · 11b1db27
Mans Rullgard authored Dec 09, 2011
```
Signed-off-by: Mans Rullgard <mans@mansr.com>
```
11b1db27
RELEASE: We're now at 0.9.0.git · 39f59a8d
Dominique Leuenberger authored Dec 16, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
39f59a8d
mpegts: replace some magic numbers with the existing define · 65a25adc
Vladimir Pantelic authored Dec 16, 2011
```
Signed-off-by: Martin Storsjö <martin@martin.st>
```
65a25adc
avidec: Check that the header chunks fit in the available filesize. · 62adc60b
Michael Niedermayer authored Dec 16, 2011
```
Fixes Ticket771
Bug found by: Diana Elena Muscalu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
62adc60b

txddemux: Limit allocated packets to filesize. · f72601d0

Michael Niedermayer authored Dec 16, 2011

Fixes Ticket772
Bug found by: Diana Elena Muscalu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

f72601d0

thp: simplify overallocate checks. · a0009754
Michael Niedermayer authored Dec 16, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
a0009754

lavf: add internal AVIOContext.maxsize · 47572323

Michael Niedermayer authored Dec 16, 2011

This allows simple and generic limiting of allocations used for packets.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

47572323

thpdemux: Check that packed sizes are within the files data size and filesize. · 482ee636
Michael Niedermayer authored Dec 16, 2011
```
Fixes Ticket774
Bug found by: Diana Elena Muscalu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
482ee636
avidec: Fix infinite loop caused by rounding of timestamps in non interleaved avis. · e098fba5
Michael Niedermayer authored Dec 16, 2011
```
Fixes Ticket775
Bug found by: Diana Elena Muscalu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
e098fba5
configure: disable avconv again. · 84e57702
Michael Niedermayer authored Dec 16, 2011
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
84e57702
j2kdec: Fix integer overflow leading to a segfault · 1f99939a
Michael Niedermayer authored Dec 16, 2011
```
Fixes Ticket776
Bug found by: Diana Elena Muscalu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
1f99939a

movenc: disable iods by default · 0988a6a0

Michael Niedermayer authored Dec 16, 2011

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Approved-by: MP4_maniac
Approved-by: Baptiste Coudurier

0988a6a0

smackerdemuxer: check some values before instead of just after malloc() · c402c1c9
Michael Niedermayer authored Dec 16, 2011
```
Fixes Ticket777
Bug Found by: Diana Elena Muscalu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
c402c1c9
westwooddemux: dont require avio_size() functionality. · e2a16e82
Michael Niedermayer authored Dec 16, 2011
```
Found by reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
e2a16e82

Export ff_vdpau_vc1_decode_picture(). · 9994643f

Carl Eugen Hoyos authored Dec 16, 2011

XBMC's configure script checks for this function in installed
libavcodec.so to determine VDPAU support.

Fixes ticket #762 reported by Christian Marillat

9994643f

swscale: add unscaled packed 16 bit per component endianess conversion · 72cb9044
Janne Grunau authored Dec 15, 2011

72cb9044

Merge remote-tracking branch 'qatar/master' · 175cc378

Michael Niedermayer authored Dec 16, 2011

* qatar/master:
  movenc: Rudimentary IODs support.
  v410enc: fix output buffer size check
  v410enc: include correct headers
  fate: add -pix_fmt rgb48le to r210 test
  flvenc: Support muxing 16 kHz nellymoser
  configure: refactor list of programs into a variable
  fate: add r210 decoder test
  fate: split off Indeo FATE tests into their own file
  fate: split off ATRAC FATE tests into their own file
  fate: Add FATE tests for v410 encoder and decoder
  ARM: fix external symbol refs in rv40 asm
  westwood: Make sure audio header info is present when parsing audio packets
  libgsm: Reset the MS mode of GSM in the flush function
  libgsm: Set options on the right object
  ARM: dca: disable optimised decode_blockcodes() for old gcc

Conflicts:
	configure
	libavformat/movenc.c
	libavformat/movenc.h
	tests/fate2.mak
	tests/ref/acodec/alac
	tests/ref/vsynth1/mpeg4
	tests/ref/vsynth2/mpeg4
Merged-by: Michael Niedermayer <michaelni@gmx.at>

175cc378

Fix typo in v210 decoder options. · 56669837
Carl Eugen Hoyos authored Dec 16, 2011

56669837

15 Dec, 2011 1 commit
- ffmpeg: check return code from av_vsrc_buffer_add_frame() · 1f273c2b
  Michael Niedermayer authored Dec 15, 2011
```
Fixed Ticket770
Bug found by: Diana Elena Muscalu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  1f273c2b