Commits · n1.2.7 · sixue.cheng / ffmpeg-7.1

23 Jun, 2014 40 commits

Update for FFmpeg 1.2.7 · cc8d20e3
Michael Niedermayer authored 11 years ago
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
cc8d20e3

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

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>

c2b72eac

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

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>

9d77a629

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

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>

f2aaee49

avcodec/mss4: Fix () in MKVAL() macro · d13cf320

Michael Niedermayer authored 11 years ago

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

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

d13cf320

avcodec/mss34dsp: fix () in SOP* macros · 5626e11b

Michael Niedermayer authored 11 years ago

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

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

5626e11b

avcodec/mlpdec: fix () in MSB_MASK() macro · 8d1f38c4

Michael Niedermayer authored 11 years ago

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

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

8d1f38c4

avcodec/golomb-test: fix () in EXTEND() macro · ea7fbd0b

Michael Niedermayer authored 11 years ago

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

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

ea7fbd0b

avcodec/aac: fix () in IS_CODEBOOK_UNSIGNED macro · b2b4df8d

Michael Niedermayer authored 11 years ago

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

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

b2b4df8d

avcodec/libvorbisenc: dont add the duration to AV_NOPTS_VALUE · 5691d9a6

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>

5691d9a6

avutil/cpu: force mmx on selection of higher x86 SIMD features · 2b8490b7

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>

2b8490b7

avcodec/diracdec: move mc buffer allocation to per frame · 4b638ea4

Michael Niedermayer authored 11 years ago


Fixes out of array accesses for non default buffers with large strides
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4a30f085

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

4b638ea4

avfilter/graphdump: Fix pointer to local outside scope · 4ecd7182

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>

4ecd7182

avcodec/mjpegdec: Fix undefined shift · 0607c8af

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>

0607c8af

ffmpeg_filter: fix pointer to local outside scope · 3c385ea2

Michael Niedermayer authored 11 years ago


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

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

3c385ea2

swresample: fix AV_CH_LAYOUT_STEREO_DOWNMIX input · c7e9626b

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>

c7e9626b

avformat/h263dec: Fix h263 probe · 26d72534

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>

26d72534

avformat/mux: Check for and remove invalid packet durations · c75a915f

Michael Niedermayer authored 11 years ago


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

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

c75a915f

avutil/lzo: add asserts to be double sure against overflows · ecd30280

Michael Niedermayer authored 11 years ago

These asserts cannot fail since d6af26c5

Based-on: ccda51b1

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

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

ecd30280

avutil/lzo: Fix integer overflow · eada99a8

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

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

eada99a8

lzo: fix overflow checking in copy_backptr() · 9ade5b80

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

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

9ade5b80

avfilter/filtfmts: Support dynamically allocated in/outputs · 753f0738

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>

753f0738

iavcodec/vc1dec: Fix missing {} · 85b00d79

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 cb53beb8

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

85b00d79

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

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>

8d60d8be

avcodec/g723_1: add assert to help static code analyzers · 53c02d04

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>

53c02d04

avcodec/diracdec: fix undefined behavior with shifts · 90c7dfb9

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>

90c7dfb9

avformat/mpegts: Remove redundant check · 424b00a3

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>

424b00a3

avcodec/mjpegen: Fix declared argument size · 7b38ea40

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 256f5306

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

7b38ea40

swscale/swscale: fix srcStride/srcSlice typo · 71104f7c

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 14fa7fc6

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

71104f7c

avcodec/x86/idct_sse2_xvid: fix non C99 inline function · 98fe429b

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>

98fe429b

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

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>

90cf672d

swscale/x86/swscale_template: loose hardcoded dstw_offset · 4af56488

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>

4af56488

swresample/resample: use av_malloc_array() where appropriate · 4065e557

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>

4065e557

swresample/dither: use av_malloc_array() · fe97363c

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>

fe97363c

swresample/resample: Limit filter length · ce959040

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>

ce959040

avcodec/msrle: check return code for success before use · a61998e4

Michael Niedermayer authored 11 years ago


The check is possibly redundant, but better to check for errors
that dont occur than to skip the check and crash

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

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

a61998e4

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

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>

e5546d48

lavu/opt: validate range before dereference · 8f7ebb88

Lukasz Marek authored 11 years ago


This change make error handling simplier.
av_opt_freep_ranges may be called when some ranges are NULL,
for example after memory allocation fail.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3aac5fcf

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

8f7ebb88

avcodec/libx264: move where x264opts is applied down so it isnt overridden by avctx & defaults · e897eb10

Michael Niedermayer authored 11 years ago


fixes x264opts opengop=1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 64b79141

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

e897eb10

avcodec/h264_mp4toannexb_bsf: prepend global headers before any in stream parameter sets · 2af3a041

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>

2af3a041

GitLab

Menu