Commits · b02e4faa3ef9384c7d6a307e518e6446b045fb98 · sixue.cheng / ffmpeg-7.1

04 Oct, 2014 40 commits

avformat/img2dec: Support -loop with pipes · b02e4faa

Michael Niedermayer authored 10 years ago


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

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

b02e4faa

Update for 2.4.2 · 09256527
Michael Niedermayer authored 10 years ago
```
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
```
09256527

avcodec/on2avc: Check number of channels · 84d26ab6

Michael Niedermayer authored 10 years ago


Fixes out of array access
Fixes: asan_heap-oob_4da4f3_7_asan_heap-oob_4da4f3_173_Xmen_avc_500.vp6

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

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

84d26ab6

avcodec/hevc: fix chroma transform_add size · 1d99adc9

Michael Niedermayer authored 10 years ago


Fixes accessing misaligned address
Fixes: signal_sigsegv_1feb99c_10_signal_sigsegv_2d1d35c_79_cov_691940146_EXT_A_ericsson_3.bit

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

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

1d99adc9

avcodec/h264: Check mode before considering mixed mode intra prediction · 67991f3a

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>

67991f3a

avformat/mpegts: use a padded buffer in read_sl_header() · 32e8922f

Michael Niedermayer authored 10 years ago


Fixes overread
Fixes: asan_heap-oob_84f75d_8_asan_heap-oob_a2a00a_341_mbc.ts

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

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

32e8922f

avformat/mpegts: Check desc_len / get8() return code · 32dbd1f3

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>

32dbd1f3

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

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>

eefc3ca7

sdp: add support for H.261 · a16558e1

Thomas Volkert authored 10 years ago

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

Conflicts:

	libavformat/version.h

a16558e1

avcodec/svq3: Dont memcpy AVFrame · 506368f5

Michael Niedermayer authored 10 years ago


This avoids out of array accesses

Fixes: asan_heap-uaf_21f42e4_9_asan_heap-uaf_21f42e4_278_gl2.mov

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

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

506368f5

avcodec/smc: fix off by 1 error · c0c24bc9

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>

c0c24bc9

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

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>

b89f279c

avcodec/gifdec: factorize interleave end handling out · 7f90eef8

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>

7f90eef8

avcodec/cinepak: fix integer underflow · 71f0a3c4

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>

71f0a3c4

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

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>

d9bef14e

avcodec/pngdec: Calculate MPNG bytewidth more defensively · 4b4ed88e

Michael Niedermayer authored 10 years ago

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

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

4b4ed88e

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

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>

f6476944

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

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>

03d30d4c

avcodec/h263dec: Fix decoding messenger.h263 · 853a27e3

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

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

853a27e3

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

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>

f7c0f835

avcodec/mjpegdec: check bits per pixel for changes similar to dimensions · 6f5c5051

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>

6f5c5051

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

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>

b29f9897

avformat/hlsenc: export inner muxer timebase · 1d987a34

Michael Niedermayer authored 10 years ago


Fixes "Non-monotonous DTS in output stream 0:0"
Fies Ticket 3797
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b1a0fccd

)

Conflicts:

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

1d987a34

configure: add noexecstack to linker options if supported. · 6099d1ca

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>

6099d1ca

avcodec/ac3enc_template: fix out of array read · a9b9751b

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>

a9b9751b

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

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>

da5e5201

avformat/img2dec: enable generic seeking for image pipes · e1fd8378

Michael Niedermayer authored 10 years ago

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

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

e1fd8378

avformat/img2dec: initialize pkt->pos for image pipes · 1d109974

Michael Niedermayer authored 10 years ago

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

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

1d109974

avformat/img2dec: pass error code and signal EOF · 76a5cf1f

Michael Niedermayer authored 10 years ago


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

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

76a5cf1f

avformat/img2dec: fix error code at EOF for pipes · 16c3d6d3

Michael Niedermayer authored 10 years ago

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

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

16c3d6d3

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

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>

9d79848f

tests/fate-run.sh: Cat .err file in case of error with V>0 · b8d34604

Michael Niedermayer authored 10 years ago


This may make fate failures where only the console output is available
easier to analyze

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

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

b8d34604

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

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>

7a02b9cb

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

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>

ff6d440d

avcodec/asvenc: fix AAN scaling · a88a57cd

Michael Niedermayer authored 10 years ago

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

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

a88a57cd

Fix compile error on arm4/arm5 platform · 0cda7baa

Bernd Kuhls authored 10 years ago

Since these commits
http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed
http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8

compilation on arm4/arm5 fails:

libavcodec/libavcodec.so: undefined reference to
`ff_startcode_find_candidate_armv6'

Because libavcodec/arm/Makefile contains
ARMV6-OBJS-$(CONFIG_STARTCODE)         += arm/startcode_armv6.o
function ff_startcode_find_candidate_armv6 is not included for older ARM
archs. The bug was found during automatic buildroot builds:

http://autobuild.buildroot.net/results/ec7/ec71e4f16ee9106747dff5f15999cbd17903e76f//build-end.log
Quote from configure summary:
ARCH                      arm (armv4t)
big-endian                no
runtime cpu detection     yes
ARMv5TE enabled           no
ARMv6 enabled             no
ARMv6T2 enabled           no

http://autobuild.buildroot.net/results/be7/be72eb182eaccf0064a32c9dfc2ac1c0d6555506/build-end.log
ARCH                      arm (armv5te)
big-endian                no
runtime cpu detection     yes
ARMv5TE enabled           yes
ARMv6 enabled             no
ARMv6T2 enabled           no

This patch provides the necessary #if clauses as discussed with Michael:
https://ffmpeg.org/pipermail/ffmpeg-devel/2014-September/163329.html

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6b733be7

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

0cda7baa

Changelog: fix sws typo · 31baa6f1

Michael Niedermayer authored 10 years ago

Found-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

31baa6f1

Merge commit '' into release/2.4 · 3b364ac1

Michael Niedermayer authored 10 years ago

* commit 'ff24824a':
  h264: reset ret to avoid propagating minor failures

See: 47048aa3

Merged-by: Michael Niedermayer <michaelni@gmx.at>

3b364ac1

Merge commit '' into release/2.4 · 63660277

Michael Niedermayer authored 10 years ago

* commit '570cefb0

':
  hevc: Initialize mergecand_list to 0
Merged-by: Michael Niedermayer <michaelni@gmx.at>

63660277

Merge commit '' into release/2.4 · 6101187c

Michael Niedermayer authored 10 years ago

* commit 'ce0972ec

':
  mpeg12: Always invoke the get_format() callback

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

6101187c

GitLab

Menu