Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-11-01avcodec/h264_parser: rewrite the parse_nal_units() loop logic based on h264.cn2.2.10Michael Niedermayer
Fixes Ticket4011 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 69a9a90d2ef795162074be24e3ad2182a8676af2) Conflicts: libavcodec/h264_parser.c
2014-11-01avcodec/h264: simplify find_start_code()Michael Niedermayer
this also uses avpriv_find_start_code(), though no speed change is expected as the area searched is generally small Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3b678da5e386c138316954e867d595f946666051) Conflicts: libavcodec/h264.h
2014-11-01Move get_avc_nalsize() and find_start_code() to h264.hMichael Niedermayer
This allows sharing them with the h264 parser Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 4898440f6bd19152373969159fff057b532c6374) Conflicts: libavcodec/h264.c libavcodec/h264.h
2014-11-01avformat/matroskadec: do not trust the default duration to be the real ↵Michael Niedermayer
1/timebase if its less than 5fps Fixes Ticket3980 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit be695ee389724d713e1b8a61ef899fe1795193ce)
2014-11-01avformat/mp3dec: Improve seeking frame sync codeMichael Niedermayer
Fixes Ticket3884 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1b5ccae0f2045ac86bc9e1257cec1b3fba81315f)
2014-11-01avformat/mpeg: increase score for short mpeg-ps by 1Michael Niedermayer
Fixes Ticket 3855 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5109ce2017c15202275b33bce58ec9d88044eeb5) Conflicts: libavformat/mpeg.c
2014-11-01update for 2.2.10Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-01avcodec/svq3: Dont memcpy AVFrameMichael Niedermayer
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 075a165d2715837d125a9cc714fb430ccf6c9d6b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-01avcodec/svq1dec: zero terminate embedded message before printingMichael Niedermayer
Fixes out of array access Fixes: asan_stack-oob_49b1e5_10_009.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e91ba2efa949470e9157b652535d207a101f91e0) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-01avcodec/cook: check that the subpacket sizes fit in block_alignMichael Niedermayer
Fixes out of array read Fixes: asan_heap-oob_fb5c50_19_018.rmvb Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 10e32618acce9c3fc64c061eb7907e8a8d2749ae) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-01avcodec/g2meet: check tile dimensions to avoid integer overflowMichael Niedermayer
Fixes out of array access Fixes: asan_heap-oob_12a55d3_30_029.wmv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 32e666c354e4a3160d8cf1d303cb51990b095c87) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-01avcodec/utils: Align dimensions by at least their chroma sub-sampling factors.Michael Niedermayer
Fixes: out of array accesses Fixes: asan_heap-oob_112c6b3_13_012.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit df74811cd53e45fcbbd3b77a1c42416816687c5c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-01avcodec/dnxhddec: treat pix_fmt like width/heightMichael Niedermayer
Fixes out of array accesses Fixes: asan_heap-oob_22c9a39_16_015.mxf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f3c0e0bf6f53df0977f3878d4f5cec99dff8de9e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-01avcodec/dxa: check dimensionsMichael Niedermayer
Fixes out of array access Fixes: asan_heap-oob_11222fb_21_020.dxa Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e70312dfc22c4e54d5716f28f28db8f99c74cc90) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-01avcodec/dirac_arith: fix integer overflowMichael Niedermayer
Fixes: asan_heap-oob_1078676_9_008.drc Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 39680caceebfc6abf09b17032048752c014e57a8) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-01avcodec/diracdec: Tighter checks on CODEBLOCKS_X/YMichael Niedermayer
Fixes very long but finite loop Fixes: asan_heap-oob_107866c_42_041.drc Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5145d22b88b9835db81c4d286b931a78e08ab76a) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-01avcodec/diracdec: Use 64bit in calculation of codeblock coordinatesMichael Niedermayer
Fixes integer overflow Fixes out of array read Fixes: asan_heap-oob_107866c_42_041.drc Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 526886e6069636a918c8c04db17e864e3d8151c1) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-01postproc: fix qp countMichael Niedermayer
Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0b7e5d0d75e7d8762dd04d35f8c0821736164372) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-01postproc/postprocess: fix quant store for fq modeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 941aaa39e8cd78ba4d16dfcec767290aec9a0136) Conflicts: tests/ref/fate/filter-pp3
2014-11-01utvideoenc: properly set slice height/last lineChristophe Gisquet
Mimic decoder and obey sampling. Does not affect fate tests for utvideo. Fixes ticket #3949. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cb530dda7d76790b08ee3b7f67e251f3ce48c359) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-01Merge commit '72ed4166a64714952777fb028b546a52e5b4e2c2' into release/2.2Michael Niedermayer
* commit '72ed4166a64714952777fb028b546a52e5b4e2c2': resample: Avoid off-by-1 errors in PTS calcs. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-01Merge commit '787a6156a2d887bb1d65c1233a94a61741e7af7c' into release/2.2Michael Niedermayer
* commit '787a6156a2d887bb1d65c1233a94a61741e7af7c': imc: fix order of operations in coefficients read Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-01Merge commit '0989a120f1dec400c54fcb54670cb84bba36d99b' into release/2.2Michael Niedermayer
* commit '0989a120f1dec400c54fcb54670cb84bba36d99b': mpeg12: Always invoke the get_format() callback Conflicts: libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-01Merge commit 'c7caed88a03567e8777a606f4bd42f093c6b302c' into release/2.2Michael Niedermayer
* commit 'c7caed88a03567e8777a606f4bd42f093c6b302c': h264: Always invoke the get_format() callback Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-18resample: Avoid off-by-1 errors in PTS calcs.Timothy B. Terriberry
The rounding used in the PTS calculations in filter_frame() does not actually match the number of samples output by the resampler. This leads to off-by-1 errors in the timestamps indicating gaps and underruns, even when the input timestamps are all contiguous. Bug-Id: 753 Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit 6cbbf0592f4f3940aac7f687850d1b726a2ea836) Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit ca8c62d187fdca13979379fb2ab172ed662aa2f8) Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-10-15imc: fix order of operations in coefficients readVittorio Giovara
Reported-by: Ruoyu <liangry@ucweb.com>
2014-10-06Update for 2.2.9n2.2.9Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-06x86/synth_filter: add missing HAVE_YASM guardJames Almer
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 206167a295a5c28cec3c38f7308835b0b7e0618f) Conflicts: libavcodec/x86/dcadsp_init.c
2014-10-06swresample/swresample: fix sample drop loop end conditionMichael Niedermayer
Fixes Ticket3985 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f9fefa499f0af48f47ea73c8ce0b25df0976c315) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05avcodec/h264: Check mode before considering mixed mode intra predictionMichael Niedermayer
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>
2014-10-05avformat/mpegts: Check desc_len / get8() return codeMichael Niedermayer
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>
2014-10-05avcodec/vorbisdec: Fix off by 1 error in ptns_to_readMichael Niedermayer
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>
2014-10-05avcodec/smc: fix off by 1 errorMichael Niedermayer
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 c727401aa9d62335e89d118a5b4e202edf39d905) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05avcodec/qpeg: fix off by 1 error in MV bounds checkMichael Niedermayer
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 dd3bfe3cc1ca26d0fff3a3baf61a40207032143f) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05avcodec/gifdec: factorize interleave end handling outMichael Niedermayer
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 8f1457864be8fb9653643519dea1c6492f1dde57) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05avcodec/cinepak: fix integer underflowMichael Niedermayer
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 e7e5114c506957f40aafd794e06de1a7e341e9d5) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05avcodec/pngdec: Calculate MPNG bytewidth more defensivelyMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e830902934a29df05c7af65aef2a480b15f572c4) Conflicts: libavcodec/pngdec.c
2014-10-05avcodec/pngdec: Check bits per pixel before setting monoblack pixel formatMichael Niedermayer
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 3e2b745020c2dbf0201fe7df3dad9e7e0b2e1bb6) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05avcodec/tiff: more completely check bpp/bppcountMichael Niedermayer
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 e1c0cfaa419aa5d320540d5a1b3f8fd9b82ab7e5) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05avcodec/mmvideo: Bounds check 2nd line of HHV Intra blocksMichael Niedermayer
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 8b0e96e1f21b761ca15dbb470cd619a1ebf86c3e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05avcodec/h263dec: Fix decoding messenger.h263Michael Niedermayer
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 d225b0f7aaa65eafccc87165130e1c4bab71708b) Conflicts: libavcodec/h263dec.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05avcodec/utils: Add case for jv to avcodec_align_dimensions2()Michael Niedermayer
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 105654e376a736d243aef4a1d121abebce912e6b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05avcodec/mjpegdec: check bits per pixel for changes similar to dimensionsMichael Niedermayer
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 5c378d6a6df8243f06c87962b873bd563e58cd39) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05avcodec/jpeglsdec: Check run value more completely in ls_decode_line()Michael Niedermayer
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 06e7d58410a17dc72c30ee7f3145fcacc425f4f2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05configure: add noexecstack to linker options if supported.Reimar Döffinger
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> (cherry picked from commit b7082d953fda93f7841ffffe7d15a6c3cd15bdee) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05avcodec/ac3enc_template: fix out of array readMichael Niedermayer
Found-by: Andreas Cadhalpun Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d85ebea3f3b68ebccfe308fa839fc30fa634e4de) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05avutil/x86/cpu: fix cpuid sub-leaf selectionlvqcl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e58fc44649d07d523fcd17aa10d9eb0d3a5ef3f4) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05libavutil/opt: fix av_opt_set_channel_layout() to access correct memory addressPhilip DeCamp
Signed-off-by: Philip DeCamp <decamp@mit.edu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 857fc0a71f1b52fbba3281ba64b5a35195458622) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05avformat/riffenc: Filter out "BottomUp" in ff_put_bmp_header()Benoit Fouet
Fixes Ticket1304 Commit message and extradata size bugfix by commiter Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6843b9dc78bc966bb30121828ef4f6b6755cf877) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05avcodec/webp: fix default palette color 0xff000000 -> 0x00000000Pascal Massimino
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e5b3112996c3da45aa03b39c5ade375d40d4407d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-26 14:28:35 +0300