Commits · n1.0.10 · sixue.cheng / FFmpeg

20 Jul, 2014 1 commit
- update for 1.0.10 · f2a8c429
  Michael Niedermayer authored 10 years ago
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  f2a8c429
12 Jul, 2014 1 commit

avformat/utils: do not wait for packets from discarded streams for genpts · 3a2c4453

Michael Niedermayer authored 10 years ago


Fixes long loop
Fixes Ticket3208
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8202c49b

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

3a2c4453

23 Jun, 2014 29 commits

avutil/lzo: Fix integer overflow · 7b5c7064

Michael Niedermayer authored 11 years ago


Embargoed-till: 2014-06-27 requested by researcher, but embargo broken by libav today (git and mailing list)

Fixes: LMS-2014-06-16-4
Found-by: "Don A. Bailey" <donb@securitymouse.com>
See: ccda51b1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d6af26c5)

Conflicts:

	libavutil/lzo.c

7b5c7064

lzo: fix overflow checking in copy_backptr() · ff712a26

Xi Wang authored 12 years ago


The check `src > dst' in the form `&c->out[-back] > c->out' invokes
pointer overflow, which is undefined behavior in C.

Remove the check.  Also replace `&c->out[-back] < c->out_start' with
a safe form `c->out - c->out_start < back' to avoid overflow.

CC: libav-stable@libav.org
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit ca6c3f2c)

Conflicts:

	libavutil/lzo.c

ff712a26

avformat/mpc: attempt to allocate a packet that is not smaller than the data inside it · 8f443e4f

Michael Niedermayer authored 11 years ago

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 86a9370e

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

8f443e4f

avcodec/alsdec: Clear MPEG4AudioConfig so that no use of uninitialized memory is possible · f48d7abf

Michael Niedermayer authored 11 years ago

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6e6bd548

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

f48d7abf

avformat/flvenc: Do not allow creating h263/mpeg4 in flv without unofficial... · 8935e239

Michael Niedermayer authored 11 years ago

avformat/flvenc: Do not allow creating h263/mpeg4 in flv without unofficial format extensions being enabled.
Found-by: Jean-Baptiste Kempf <jb@videolan.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 74760883

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

8935e239

avcodec/libvorbisenc: dont add the duration to AV_NOPTS_VALUE · a116f16e

Michael Niedermayer authored 11 years ago

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 19e66c72

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

a116f16e

avutil/cpu: force mmx on selection of higher x86 SIMD features · 1930efe2

Michael Niedermayer authored 11 years ago


Fixes various runtime failures with manually set flags that represent no
existing CPU

Fixes Ticket3653
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6310eb80

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

1930efe2

avfilter/graphdump: Fix pointer to local outside scope · 033b0a4e

Michael Niedermayer authored 11 years ago


Fixes CID1194435
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 18af0ce6

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

033b0a4e

avcodec/mjpegdec: Fix undefined shift · 2277706b

Michael Niedermayer authored 11 years ago


Fixes CID1194388
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b4329605

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

2277706b

swresample: fix AV_CH_LAYOUT_STEREO_DOWNMIX input · 6b0c1ed1

Michael Niedermayer authored 11 years ago


Fixes Ticket 3542
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 291d4641

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

6b0c1ed1

avformat/h263dec: Fix h263 probe · acba4d1e

Michael Niedermayer authored 11 years ago


The code was missing 1 bit in the src format
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fc145e57

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

acba4d1e

avfilter/filtfmts: Support dynamically allocated in/outputs · ee0db8a5

Michael Niedermayer authored 11 years ago


Fixes crash
Fixes Ticket3468
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 59c7615d

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

ee0db8a5

avfilter/vf_deshake: fix loss of precission with odd resolutions · 8ef02e4e

Michael Niedermayer authored 11 years ago


Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 73734282

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

8ef02e4e

avcodec/g723_1: add assert to help static code analyzers · 43d24fc3

Michael Niedermayer authored 11 years ago

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1457f3fd

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

43d24fc3

avcodec/diracdec: fix undefined behavior with shifts · 00476d92

Michael Niedermayer authored 11 years ago


Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b8598f6c

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

00476d92

avformat/mpegts: Remove redundant check · f3230ba0

Michael Niedermayer authored 11 years ago


Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ff6fa0b4

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

f3230ba0

avcodec/x86/idct_sse2_xvid: fix non C99 inline function · 0443fe26

Michael Niedermayer authored 11 years ago

Found-by: Matt Oliver <protogonoi@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 46d5625f

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

0443fe26

avcodec/dirac_arith: Fix build with PIC and stack-check options · b5ec163e

Anthoine Bourgeois authored 11 years ago


Fixes Ticket3540

The function dirac_get_arith_bit in libavcodec/dirac_arith.h can't be
built with PIC and check-stack because the asm code needs 6 registers
and PIC and check-stack options take 1 each and x86 is quite limited
in this area.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d8ab7f31

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

b5ec163e

swscale/x86/swscale_template: loose hardcoded dstw_offset · f80af81e

Michael Niedermayer authored 11 years ago

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f6759d9a

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

f80af81e

swresample/resample: use av_malloc_array() where appropriate · d7573f88

Michael Niedermayer authored 11 years ago

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5027f397

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

d7573f88

swresample/dither: use av_malloc_array() · b1ac8b1d

Michael Niedermayer authored 11 years ago

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a5290cb1

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

b1ac8b1d

swresample/resample: Limit filter length · 81e5ce4c

Michael Niedermayer authored 11 years ago


Related to CID1197063

The limit choosen is arbitrary and much larger than what makes sense.
It avoids the need for checking arithmetic operations with the length for overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f9158b01

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

81e5ce4c

avcodec/wma: use av_freep(), do not leave stale pointers in memory · 12eb9d91

Michael Niedermayer authored 11 years ago

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d167faaf

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

12eb9d91

avcodec/h264_mp4toannexb_bsf: prepend global headers before any in stream parameter sets · 551f3695

Michael Niedermayer authored 11 years ago


Fixes h264_mp4toannexb_bsf_failure.mkv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 289b149c

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

551f3695

avcodec/x86/mpegvideoenc_template: fix integer overflow · 5f7e6b9c
Michael Niedermayer authored 11 years ago
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
5f7e6b9c

avcodec/h263dec: Fix use of uninitialized memory from the bitstream buffer · 1ec03662

Michael Niedermayer authored 11 years ago

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f07cebcd

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

1ec03662

swscale/x86/swscale: fix missing xmm clobbers in yuv2yuvX_sse3() · 588ae964

Michael Niedermayer authored 11 years ago

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6c47a4e9

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

588ae964

matroska: Fix use after free · 85b1ce97

Dale Curtis authored 12 years ago

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit ae3d4163

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

85b1ce97

vorbisdec: Check bark_map_size. · 0916d0f9

Michael Niedermayer authored 12 years ago


This fixes potential divisions by zero and out of array accesses.
Reported-by: Dale Curtis <dalecurtis@chromium.org>
Found-by: inferno@chromium.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2c16bf2d

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

0916d0f9

16 Apr, 2014 2 commits

avformat/matroskadec: support SVQ3 as generated by mkvtoolnix-6.6.0 · 66c927d2

Michael Niedermayer authored 11 years ago


Fixes part of Ticket3256
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5800b085)

Conflicts:
	libavformat/matroskadec.c

66c927d2

avformat/matroskaenc: wrap V_QUICKTIME codec private in something that looks... · ea66bd0d

Michael Niedermayer authored 11 years ago

avformat/matroskaenc: wrap V_QUICKTIME codec private in something that looks like its part of quicktime stsd

This is needed for matroska spec compliance
Fixes playback of SVQ3 in matroska with vlc
Fixes Ticket 3256
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8456bd2c)

ea66bd0d

24 Mar, 2014 2 commits

avformat/mov: fix keyframe flags for sample from chromium Issue 340865 · be66ae3b
Michael Niedermayer authored 11 years ago
```
Fixes ticket #3362.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a0911b05)
```
be66ae3b

avformat/mov: only force parsing for video tracks if stss is empty · 519675c4

Hendrik Leppkes authored 11 years ago

Fixes playback of some AAC streams, which are otherwise mangled by the
parser, and stss is typically only valid for video anyway.

Fixes a regression since e41ea866

.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 019247bd)

519675c4

10 Mar, 2014 1 commit
- update for 1.0.9 · 08f53e1b
  Michael Niedermayer authored 11 years ago
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  08f53e1b
08 Mar, 2014 4 commits

Merge remote-tracking branch 'TimothyGu/release/1.0' into release/1.0 · 8418de29
Michael Niedermayer authored 11 years ago
```
* TimothyGu/release/1.0:
  configure: use pkg-config to detect libbluray
Merged-by: Michael Niedermayer <michaelni@gmx.at>
```
8418de29

avcodec/utvideoenc: fix slice_bits size · e59fe789

Michael Niedermayer authored 11 years ago


Fixes assertion failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0a8c9020

)

Conflicts:

	libavcodec/utvideoenc.c
(cherry picked from commit 57522ca79cc38c279123596d3288ddbf56fa8903)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

e59fe789

avcodec/snow: split block clipping checks · a0d15a62

Michael Niedermayer authored 11 years ago


Fixes out of array read
Fixes: d4476f68ca1c1c57afbc45806f581963-asan_heap-oob_2266b27_8607_cov_4044577381_snow_chroma_bug.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 61d59703

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

a0d15a62

avcodec/ansi: fix integer overflow · d7071f67

Michael Niedermayer authored 11 years ago


Fixes out of array read
Fixes: 5f9698e86d92f19bb08d54ff0d57027f-signal_sigsegv_b30756_3795_cov_2693691257_ansi256.ans
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d42ec843

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

d7071f67

GitLab

Menu