Commits · 7acee6654ccdbadea62e700970f789478febaa0c · Stefan Westerfeld / ffmpeg

14 Nov, 2012 6 commits

mpeg12data: increase size of ff_mpeg1_default_intra_matrix to prevent harmless... · 7acee665

Michael Niedermayer authored Nov 14, 2012

mpeg12data: increase size of ff_mpeg1_default_intra_matrix to prevent harmless overreads from crashing

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

7acee665

aasc: check before reading the first 4 byte, fix overread · e1631f8e
Michael Niedermayer authored Nov 14, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
e1631f8e
vmnc: check input size before reading chunk header, fix overread · 39c5cd60
Michael Niedermayer authored Nov 14, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
39c5cd60

Merge remote-tracking branch 'lippit/master' · b6165882

Michael Niedermayer authored Nov 14, 2012

* lippit/master:
  Update iec61883 to handle multiple devices, and allow selection of DV device by its GUID
Merged-by: Michael Niedermayer <michaelni@gmx.at>

b6165882

ffmpeg: fix double ;; · 9f088712
Michael Niedermayer authored Nov 14, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
9f088712
ffmpeg: fix audio timestamps on stream copy with -ss · 9406d6be
Michael Niedermayer authored Nov 14, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
9406d6be

13 Nov, 2012 31 commits

imc: sanity check scalefactors. · 2f74f8d7

Michael Niedermayer authored Nov 13, 2012

This fixes undefined behavior

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

2f74f8d7

lxfdec: fix "no audio stream" check. avoid null ptrs deref · 1f196051
Michael Niedermayer authored Nov 13, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
1f196051
lavfi/frei0r: add additional trailing slash in FREI0R_PATH paths · 334a0d15
Stefano Sabatini authored Oct 29, 2012
```
Allow to accept paths with no ending trailing slash.

Based on a patch by rogerdpack <rogerpack2005@gmail.com>.
```
334a0d15
lavfi/frei0r: correctly handle paths longer than 1023 chars · 9a2028d4
Stefano Sabatini authored Oct 29, 2012

9a2028d4
av_probe_input_format3: support NULL as buffer. Fixes null ptr deref · af9ec3dd
Michael Niedermayer authored Nov 13, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
af9ec3dd
alac: check channel count more completely, fix out of array read · 001af703
Michael Niedermayer authored Nov 13, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
001af703

avrndec: calculate true_height only when used. · b1191331

Michael Niedermayer authored Nov 13, 2012

Fixes division by 0

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

b1191331

pcmdec: consistently use codec_id, fixes out of array reads · 7373b3ad
Michael Niedermayer authored Nov 13, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
7373b3ad

mpegts: prevent freeing ones own section in pat_cb · eab022d8

Michael Niedermayer authored Nov 13, 2012

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

eab022d8

mov: check stps correctly, avoid overreading 1 element. · 4392e69a
Michael Niedermayer authored Nov 13, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
4392e69a
dvdec: check ipcm more completely, avoid assert failure. · 3669915e
Michael Niedermayer authored Nov 13, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
3669915e
lavf/wtvenc: fix s[tp]_pairs memleak. · 41ebbb3b
Clément Bœsch authored Nov 11, 2012

41ebbb3b
Update iec61883 to handle multiple devices, and allow · 15b02dde
Georg Lippitsch authored Jul 12, 2012
```
selection of DV device by its GUID
```
15b02dde
mpeg4video_parser: init static tables before use, fix nulll ptr deref · 7c76eaec
Michael Niedermayer authored Nov 13, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
7c76eaec
mpeg4videodec: split static decoder table init out · 1bd024ec
Michael Niedermayer authored Nov 13, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
1bd024ec

rv10: consider B frames in low delay streams invalid. · c74cd999

Michael Niedermayer authored Nov 13, 2012

Fix assertion failure

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

c74cd999

dcadec: check layout & channel count for consistency. · a0212ecf

Michael Niedermayer authored Nov 13, 2012

Fixes out of array accesses

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

a0212ecf

mpegts: dont set stream info when a decoder has already been opened. · 4facddd5

Michael Niedermayer authored Nov 13, 2012

Fixes assertion failure.

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

4facddd5

mpegts: prevent freeing ones own section in pmt_cb · 327cd0d0

Michael Niedermayer authored Nov 13, 2012

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

327cd0d0

paf: set channel layout · 09a03923
Paul B Mahol authored Nov 13, 2012
```
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
09a03923
Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h · 1acd2f6b
Paul B Mahol authored Nov 13, 2012
```
Also remove it in once case when it is not needed.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
```
1acd2f6b
avcodec.h: update audioconvert.h header after rename · e97a2410
Michael Niedermayer authored Nov 13, 2012
```
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
e97a2410
lavfi: store and propagate number of channels information in audio buffer properties · 79456652
Stefano Sabatini authored Jul 30, 2012
```
The channels field is required since the channel layout is not always
available.
```
79456652
doc/encoders: document libtheora encoder · 9d2a7c04
Stefano Sabatini authored Nov 11, 2012

9d2a7c04
lavc/libtheoraenc: return proper error codes · 8cb76ef2
Stefano Sabatini authored Nov 11, 2012

8cb76ef2

Merge remote-tracking branch 'qatar/master' · 799d749c

Michael Niedermayer authored Nov 13, 2012

* qatar/master: (24 commits)
  yop: set channel layout
  wtv: set channel layout for mpeg audio
  westwood_aud: set channel layout
  wc3movie: set channel layout
  tmv: set channel layout
  tiertexseq: set channel layout
  swfdec: set channel layout
  sol: set channel layout
  smacker: set channel layout
  siff: set channel layout
  sierravmd: set channel layout
  rtpdec_amr: set channel layout
  rsodec: set channel layout
  rmdec: set channel layout for RA version 3
  qcp: set channel layout
  psxstr: set channel layout
  omadec: set channel layout
  oggparsespeex: validate channel count and set channel layout
  nuv: set channel layout
  mxg: set channel layout
  ...

Conflicts:
	libavformat/swfdec.c
	libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

799d749c

Merge commit '' · 7eb40d85

Michael Niedermayer authored Nov 13, 2012

* commit 'ef1b23ad': (21 commits)
  jvdec: set channel layout
  iss: set channel layout
  ipmovie: set channel layout
  iff: set channel layout
  idroqdec: set channel layout
  gxfdec: set channel layout when applicable
  gsmdec: set channel layout
  flvdec: set channel layout
  dv: set channel layout
  dsicin: set channel layout
  daud: set channel layout
  cdxl: set channel layout
  bmv: set channel layout
  bink: set channel layout
  bfi: set channel layout
  bethsoftvid: set channel layout
  apc: set channel layout
  amr: set channel_layout
  ppc: replace pointer casting with AV_COPY32
  ppc: fix some unused variable warnings
  ...

Conflicts:
	libavformat/amr.c
	libavformat/iff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

7eb40d85

remove tests/asynth1.sw · a8f2420e

Michael Niedermayer authored Nov 13, 2012

This file appears to have been commited by 100l mistake.

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

a8f2420e

fate/avfilter: honor GPL dependency. · f6f52936
Clément Bœsch authored Nov 13, 2012

f6f52936
wavpack: check the blocks sample count, fix out of array accesses · d8a1eb11
Michael Niedermayer authored Nov 13, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
d8a1eb11
wavpack: check ch_offset · 580021cf
Michael Niedermayer authored Nov 13, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
580021cf

12 Nov, 2012 3 commits

flashv: check if keyframe is available, fix null deref. · e9cb533f
Michael Niedermayer authored Nov 12, 2012
```
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
e9cb533f
flashv: use avcodec_set_dimensions() · 4b2f696d
Michael Niedermayer authored Nov 12, 2012
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
4b2f696d

svq1dec: dont export the qscale table. · 0a373c31

Michael Niedermayer authored Nov 12, 2012

SVQ1 has no qscales so the table is of no use, and it triggers a bug as
SVQ1 does not maintain the size of the table properly causing a crash.

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

0a373c31