Commits · n2.2.9 · sixue.cheng / ffmpeg-7.1

06 Oct, 2014 1 commit
- Update for 2.2.9 · b05d3550
  Michael Niedermayer authored 10 years ago
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
  b05d3550
05 Oct, 2014 25 commits

x86/synth_filter: add missing HAVE_YASM guard · f253fa95

James Almer authored 11 years ago


Should fix compilation failures with --disable-yasm on some compilers
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 206167a2)

Conflicts:

	libavcodec/x86/dcadsp_init.c

f253fa95

swresample/swresample: fix sample drop loop end condition · a28c276b

Michael Niedermayer authored 10 years ago


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

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

a28c276b

avcodec/h264: Check mode before considering mixed mode intra prediction · 26da47a0

Michael Niedermayer authored 10 years ago


Fixes out of array read
Fixes: asan_heap-oob_e476fc_2_asan_heap-oob_1333ec6_61_CAMACI3_Sony_C.jsv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9734a7a1

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

26da47a0

avformat/mpegts: Check desc_len / get8() return code · 23fdcd3b

Michael Niedermayer authored 10 years ago


Fixes out of array read
Fixes: signal_sigsegv_844d59_10_signal_sigsegv_a17bb7_366_mpegts_mpeg2video_mp2_dvbsub_topfield.rec

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c3d7f00e

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

23fdcd3b

avcodec/vorbisdec: Fix off by 1 error in ptns_to_read · 653329df

Michael Niedermayer authored 10 years ago


Fixes read of uninitialized memory
Fixes: asan_heap-uaf_18dac2b_9_asan_heap-uaf_22eb375_208_beta3_test_small.ogg

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8c50704e

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

653329df

avcodec/smc: fix off by 1 error · b0964918

Michael Niedermayer authored 10 years ago


Fixes out of array access
Fixes: asan_heap-oob_1685bf0_5_asan_heap-oob_1f35116_430_smc.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c727401a

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

b0964918

avcodec/qpeg: fix off by 1 error in MV bounds check · d8fda618

Michael Niedermayer authored 10 years ago


Fixes out of array access
Fixes: asan_heap-oob_153760f_4_asan_heap-oob_1d7a4cf_164_VWbig6.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit dd3bfe3c

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

d8fda618

avcodec/gifdec: factorize interleave end handling out · 43881c77

Michael Niedermayer authored 10 years ago


also change it to a loop
Fixes out of array access
Fixes: asan_heap-oob_ca5410_8_asan_heap-oob_ca5410_97_ID_LSD_Size_Less_Then_Data_Inter_3.gif

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8f145786

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

43881c77

avcodec/cinepak: fix integer underflow · 42bdcebf

Michael Niedermayer authored 10 years ago


Fixes out of array access
Fixes: asan_heap-oob_4da0ba_6_asan_heap-oob_4da0ba_241_cvid_crash.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e7e5114c

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

42bdcebf

avcodec/pngdec: Calculate MPNG bytewidth more defensively · d1e71ecb

Michael Niedermayer authored 10 years ago

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

Conflicts:

	libavcodec/pngdec.c

d1e71ecb

avcodec/pngdec: Check bits per pixel before setting monoblack pixel format · 64be1a45

Michael Niedermayer authored 10 years ago


Fixes out of array accesses
Fixes: asan_heap-oob_14dbfcf_4_asan_heap-oob_1ce5767_179_add_method_small.png

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3e2b7450

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

64be1a45

avcodec/tiff: more completely check bpp/bppcount · f8bd98ae

Michael Niedermayer authored 10 years ago


Fixes pixel format selection
Fixes out of array accesses
Fixes: asan_heap-oob_1766029_6_asan_heap-oob_20aa045_332_cov_1823216757_m2-d1d366d7965db766c19a66c7a2ccbb6b.tif

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e1c0cfaa

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

f8bd98ae

avcodec/mmvideo: Bounds check 2nd line of HHV Intra blocks · f2c6e2c3

Michael Niedermayer authored 10 years ago


Fixes out of array access
Fixes: asan_heap-oob_4da4f3_8_asan_heap-oob_4da4f3_419_scene1a.mm

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8b0e96e1

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

f2c6e2c3

avcodec/h263dec: Fix decoding messenger.h263 · 8acfae69

Michael Niedermayer authored 10 years ago

Fixes http://samples.mplayerhq.hu/V-codecs/h263/h263-raw/messenger.h263
Fixes regression since b239f3f6



Found-by: Josh Allmann
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d225b0f7

)

Conflicts:

	libavcodec/h263dec.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

8acfae69

avcodec/utils: Add case for jv to avcodec_align_dimensions2() · e5ccd894

Michael Niedermayer authored 10 years ago


Fixes out of array accesses
Fixes: asan_heap-oob_12304aa_8_asan_heap-oob_4da4f3_300_intro.jv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 105654e3

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

e5ccd894

avcodec/mjpegdec: check bits per pixel for changes similar to dimensions · 6287107e

Michael Niedermayer authored 10 years ago


Fixes out of array accesses
Fixes: asan_heap-oob_16668e9_2_asan_heap-oob_16668e9_346_miss_congeniality_pegasus_mjpg.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5c378d6a

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

6287107e

avcodec/jpeglsdec: Check run value more completely in ls_decode_line() · 53330b30

Michael Niedermayer authored 10 years ago


previously it could have been by 1 too large
Fixes out of array access
Fixes: asan_heap-oob_12240f5_1_asan_heap-oob_12240f5_448_t8c1e3.jls
Fixes: asan_heap-oob_12240f5_1_asan_heap-oob_12240f5_448_t8nde0.jls
Fixes: asan_heap-oob_12240fa_1_asan_heap-oob_12240fa_448_t16e3.jls

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 06e7d584

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

53330b30

configure: add noexecstack to linker options if supported. · 9726c1a5

Reimar Döffinger authored 10 years ago

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
(cherry picked from commit b7082d95

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

9726c1a5

avcodec/ac3enc_template: fix out of array read · f1dd3430

Michael Niedermayer authored 10 years ago


Found-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d85ebea3

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

f1dd3430

avutil/x86/cpu: fix cpuid sub-leaf selection · be894938

lvqcl authored 10 years ago

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

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

be894938

libavutil/opt: fix av_opt_set_channel_layout() to access correct memory address · fe0fd3de

Philip DeCamp authored 10 years ago

Signed-off-by: Philip DeCamp <decamp@mit.edu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 857fc0a7

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

fe0fd3de

avformat/riffenc: Filter out "BottomUp" in ff_put_bmp_header() · fe12b3a7

Benoit Fouet authored 10 years ago


Fixes Ticket1304

Commit message and extradata size bugfix by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6843b9dc

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

fe12b3a7

avcodec/webp: fix default palette color 0xff000000 -> 0x00000000 · a1605af9

Pascal Massimino authored 10 years ago

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

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

a1605af9

avcodec/libilbc: support for latest git of libilbc · b0937dd6

Gianluigi Tiesi authored 10 years ago


in the latest git commits of libilbc developers removed WebRtc_xxx typedefs

This commit uses int types instead,
it's safe to apply also for previous versions since
WebRtc_Word16 was always a typedef of int16_t and
WebRtc_UWord16 a typedef of uint16_t
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 59af5383

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

b0937dd6

Merge commit '' into release/2.2 · ac0dea5d

Michael Niedermayer authored 10 years ago

* commit 'f13f5a7d

':
  Add some bug references to the changelog

Conflicts:
	Changelog

no changes as this does not match FFmpeg releases
Merged-by: Michael Niedermayer <michaelni@gmx.at>

ac0dea5d

20 Sep, 2014 14 commits

update for 2.2.8 · 5df02760
Michael Niedermayer authored 10 years ago
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
5df02760

avcodec: fix aac/ac3 parser bitstream buffer size · 014dee89

Michael Niedermayer authored 10 years ago


Buffers containing copies of the AAC and AC3 header bits were not padded
before parsing, violating init_get_bits() buffer padding requirement,
leading to potential buffer read overflows.
This change adds FF_INPUT_BUFFER_PADDING_SIZE bytes to the bit buffer
for parsing the header in each of aac_parser.c and ac3_parser.c.

Based on patch by: Matt Wolenetz <wolenetz@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fccd85b9

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

014dee89

wavpackenc: proper buffer allocation · da1a8191

Christophe Gisquet authored 10 years ago


The allocation didn't account for headers, that can be easily 79 bytes.
As a result, buffers allocated for a few samples (e.g. 5 in the original
bug) could be undersized.

Fixed ticket #2881.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2ba58bec

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

da1a8191

wavpack: report if there is no bits left · dd9b24a4

Christophe Gisquet authored 10 years ago

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 11a39bdf

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

dd9b24a4

x86/dsputil: add emms to ff_scalarproduct_int16_mmxext() · 16b5df17

James Almer authored 11 years ago


Also undo the changes to ra144enc.c from previous commits.
Should fix ticket #3429
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9e0e1f90

)

Conflicts:

	libavcodec/ra144enc.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

16b5df17

libavcodec/webp: treat out-of-bound palette index as translucent black · 99af97ea

Pascal Massimino authored 10 years ago

See https://code.google.com/p/webp/issues/detail?id=206


for a description of the problem/fix.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This patch makes the decoder follow the recommendation of the spec.
There is some disagreement (see "[FFmpeg-devel] [PATCH]: libavcodec/webp")
about what would be best to be written in the spec, so in case the spec
is changed again, this potentially would need to be amended or reverted
(cherry picked from commit 4fd21d58

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

99af97ea

avcodec/x86/vp9lpf: Always include x86util.asm · 6c66ea5e

Michael Niedermayer authored 10 years ago


Fixes executable stack
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 41d82b85

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

6c66ea5e

tools/crypto_bench: fix build when AV_READ_TIME is unavailable · 252356cf

Michael Niedermayer authored 10 years ago

Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4a99134f

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

252356cf

avformat/m4vdec: Check for non startcode 00 00 00 sequences in probe · 56fb830c

Michael Niedermayer authored 10 years ago


Fixes miss detection of PCM as m4v
Fixes Ticket 3928
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7c1835c5

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

56fb830c

avcodec/mpegvideo: Set err on failure in ff_mpv_common_frame_size_change() · d19b5564

Michael Niedermayer authored 10 years ago


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

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

d19b5564

avcodec/mpegvideo: check that the context is initialized in ff_mpv_common_frame_size_change() · fd6230e8

Michael Niedermayer authored 10 years ago


The function otherwise would initialize the context without setting context_initialized
alternatively we could set context_initialized

Fixes valgrind anomalies related to ticket 3928
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0d0f7f0b

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

fd6230e8

avcodec/mpegvideo: Use "goto fail" for all error paths in ff_mpv_common_frame_size_change() · 9406d3c9

Michael Niedermayer authored 10 years ago

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

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

9406d3c9

avcodec/h264: Allow partial escaping · 9e1ce9a8

Michael Niedermayer authored 10 years ago


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

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

9e1ce9a8

avformat/swfdec: Do not change the pixel format · b4d2888c

Michael Niedermayer authored 10 years ago


This is currently not supported
Fixes part of Ticket 3539
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c2430304

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

b4d2888c

GitLab

Menu