delta/ffmpeg.git, branch n2.4.2 git.ffmpeg.org: ffmpeg.git avformat/img2dec: Attempt to detect non-escaped glob patterns too (-pattern_type glob) 2014-10-05T01:58:09+00:00 Alexander Strasser eclipse7@gmx.net 2014-10-05T01:42:32+00:00 d61454e7c1de48f6a9059ca98f55e6beb52a618c Fixes ticket #3948 Based-on-patch-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Alexander Strasser <eclipse7@gmx.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e079d43af86c38a0c0efb9bc6058e1316e6a18f4) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
Fixes ticket #3948

Based-on-patch-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e079d43af86c38a0c0efb9bc6058e1316e6a18f4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/img2dec: Support -loop with pipes 2014-10-04T23:55:54+00:00 Michael Niedermayer michaelni@gmx.at 2014-10-04T23:49:25+00:00 b02e4faa3ef9384c7d6a307e518e6446b045fb98 Fixes Ticket3976 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 684508ba15ca15d5d43f67bbed483ce5b6617f10) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
Fixes Ticket3976

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Update for 2.4.2 2014-10-04T22:53:35+00:00 Michael Niedermayer michaelni@gmx.at 2014-10-04T22:33:48+00:00 09256527be47cc2b39d84aadfc74b8e51125f6a6 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/on2avc: Check number of channels 2014-10-04T21:52:29+00:00 Michael Niedermayer michaelni@gmx.at 2014-10-04T20:15:07+00:00 84d26ab6eb07e22ad6ffcd8109ca1d1a0cd57bce 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 550f3e9df3410b3dd975e590042c0d83e20a8da3) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
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 550f3e9df3410b3dd975e590042c0d83e20a8da3)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/hevc: fix chroma transform_add size 2014-10-04T21:52:29+00:00 Michael Niedermayer michaelni@gmx.at 2014-10-04T14:17:32+00:00 1d99adc95317d0e671d479a7643c706408736552 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 df8394c693d3c1e13b7ebf6af01c5e55321cf952) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
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 df8394c693d3c1e13b7ebf6af01c5e55321cf952)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/h264: Check mode before considering mixed mode intra prediction 2014-10-04T21:52:29+00:00 Michael Niedermayer michaelni@gmx.at 2014-10-04T12:51:46+00:00 67991f3a3e5a5cfca9e049a6af0ad8b7325e55b7 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 9734a7a1de3043f012ad0f1ef11027d9488067e6) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
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 9734a7a1de3043f012ad0f1ef11027d9488067e6)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/mpegts: use a padded buffer in read_sl_header() 2014-10-04T21:52:29+00:00 Michael Niedermayer michaelni@gmx.at 2014-10-04T03:14:08+00:00 32e8922faf2e86d6db1900eb6ab9a0ad0c1542d7 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 27f6da292118850ca7900de64d06b56e0ebb5070) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
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 27f6da292118850ca7900de64d06b56e0ebb5070)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/mpegts: Check desc_len / get8() return code 2014-10-04T21:52:29+00:00 Michael Niedermayer michaelni@gmx.at 2014-10-04T02:29:40+00:00 32dbd1f3428b7d071e5d05c19b79c56e59bacdbe 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 c3d7f00ee3e09801f56f25db8b5961f25e842bd2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
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 c3d7f00ee3e09801f56f25db8b5961f25e842bd2)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/vorbisdec: Fix off by 1 error in ptns_to_read 2014-10-04T21:52:29+00:00 Michael Niedermayer michaelni@gmx.at 2014-10-04T01:12:34+00:00 eefc3ca7bed6c389e2c78c4244ee2a41d25b8963 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 8c50704ebf1777bee76772c4835d9760b3721057) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
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 8c50704ebf1777bee76772c4835d9760b3721057)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
sdp: add support for H.261 2014-10-04T21:52:29+00:00 Thomas Volkert thomas@homer-conferencing.com 2014-10-03T22:17:01+00:00 a16558e12204e5ae4597d5d384bbfca293fe74cb Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1c4c78ee4073b2387681d916a167b758369b9216) Conflicts: libavformat/version.h 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1c4c78ee4073b2387681d916a167b758369b9216)

Conflicts:

	libavformat/version.h