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-08-30avcodec/lcldec: fix decoding of YUV444 samplen1.1.14Piotr Bandurski
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a3329a09f93455a44ff3c9c64886c4da1f66bcfb) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30alacenc: fix extra bits extractionChristophe Gisquet
The raw coded bits are extracted prior to decorrelation, as is correctly performed by the decoder, and not after. Fixes ticket #2768. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 96d217832598da7001bc204706476dd1e37f377e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30alacenc: increase predictor bufferChristophe Gisquet
This change is almost cosmetical only, and reduces the changes needed to fix the 24bps case. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c0d18cc085b13cdfb05ea90a20b46235fb4fa0a9) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30wavpack: report if there is no bits leftChristophe Gisquet
Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 11a39bdf534a4ead634b4a593c66ebf756910b9b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30avcodec/adpcm: Fix incorrect AVSampleFormat for sample_fmts_s16pJon Morley
The AVSampleFormat list of sample_fmts_s16p is missing the trailing "P" for planar formats. AV_SAMPLE_FMT_S16 vs AV_SAMPLE_FMT_S16P Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 18e70006e7d39f256079cd461a0fe75f1e9cbfd2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30version.sh: Print versions based on the last git tag for release branchesMichael Niedermayer
release branches are detected by checking if "git" is not in RELEASE This changes "N-64706-g2f71aeb" to "n2.3-8-g2f71aeb" for git master theres no change This should improve the readability of lists of versions which come from more than 1 release branch or master + release. fate.ffmpeg.org is one possible example Reviewed-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ee606fd0317df202b59946cf9b738c0a01056316) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1f4d779e87050111f831f24645580f04e0b1917b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0a64e9a0299b8ded2508be4c6f4949f8f8f57724) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30remove VERSION fileMichael Niedermayer
it overrides what version.sh prints and thus makes its output from release branches rather useless Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 2f71aeb30161edb5cb0fea5d3080094a22cc3038) Conflicts: VERSION (cherry picked from commit f543d32455a30c7e11206241184dfb16b8a8081c) Conflicts: VERSION (cherry picked from commit 59b2a9ef957ec796ccf457aad263a52bc457b610) Conflicts: VERSION Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30Update for 1.1.14Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30avcodec/snow: check coeffs for validityMichael Niedermayer
Fixes deadlock Fixes integer overflow Fixes Ticket 3892 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 596636a474ab201badaae269f3a2cef4824b8c1f) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30avcodec/utils: add GBRP16 to avcodec_align_dimensions2()Michael Niedermayer
Fixes Ticket3869 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3fe9e7be4c70c8fccdcd56fd19276e668cfb7de8) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30avcodec: fix aac/ac3 parser bitstream buffer sizeMichael Niedermayer
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 fccd85b9f30525f88692f53134eba41f1f2d90db) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30proresenc_kostya: report buffer overflowChristophe Gisquet
If the allocated size, despite best efforts, is too small, exit with the appropriate error. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 52b81ff4635c077b2bc8b8d3637d933b6629d803) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30avcodec/iff: check pixfmt for rgb8 / rgbnMichael Niedermayer
Fixes out of array access Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3539d6c63a16e1b2874bb037a86f317449c58770) Conflicts: libavcodec/iff.c (cherry picked from commit 656f930160db48e0b7b25069c62abc340e7f0628) Conflicts: libavcodec/iff.c (cherry picked from commit abc1fa7c5a1dca1345b9471b81cfcda00c56220d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30Merge commit '124ec8b1303d4f29b833099ce9008e31ac6d7c86' into release/1.1Michael Niedermayer
* commit '124ec8b1303d4f29b833099ce9008e31ac6d7c86': pulse: Add a wallclock option to be compatible with other other captures Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30Merge commit 'e1f0c41e1aa37a9c166c43abf1b526c796ed7649' into release/1.1Michael Niedermayer
* commit 'e1f0c41e1aa37a9c166c43abf1b526c796ed7649': avconv: fix parsing the AVOptions for -target Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30Merge commit '8d7839fc7c52574dfc22db0181b1cef9cb929910' into release/1.1Michael Niedermayer
* commit '8d7839fc7c52574dfc22db0181b1cef9cb929910': avconv: fix the muxrate values for -target Conflicts: ffmpeg_opt.c No change, as ffmpegs muxrate is in bits/sec Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30Merge commit 'bbd632082b18e6c5ce9c2d6be8bc260c05ae9417' into release/1.1Michael Niedermayer
* commit 'bbd632082b18e6c5ce9c2d6be8bc260c05ae9417': mpegenc: limit the maximum muxrate Conflicts: libavformat/mpegenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30Merge commit 'e4fb53c73abece15a7c5df0019df9a0371db2297' into release/1.1Michael Niedermayer
* commit 'e4fb53c73abece15a7c5df0019df9a0371db2297': ffv1dec: check that global parameters do not change in version 0/1 Conflicts: libavcodec/ffv1dec.c See: f78a3868fd3d8f66da68338c0783aa15f98833bf Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30Merge commit 'bd41211395fd1f968e9f3a4746daffebea60f41e' into release/1.1Michael Niedermayer
* commit 'bd41211395fd1f968e9f3a4746daffebea60f41e': Re-release 9.15 as 9.16 Prepare for 9.15 Release Update Changelog for v9.15 Conflicts: Changelog RELEASE Not merged, as the versions are different in FFmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30Merge commit '437848e37ae7ef73cd8101031dc570d1f009ffd5' into release/1.1Michael Niedermayer
* commit '437848e37ae7ef73cd8101031dc570d1f009ffd5': vp3: Copy all 3 frames for thread updates See: 247d30a7dba6684ccce4508424f35fd58465e535 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30Merge commit 'addbaf134836aea4e14f73add8c6d753a1373257' into release/1.1Michael Niedermayer
* commit 'addbaf134836aea4e14f73add8c6d753a1373257': mpegts: Do not try to write a PMT larger than SECTION_SIZE Conflicts: libavformat/mpegtsenc.c See: 694c3a13c9489c6e05f88486b489dd0746d114fc Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30Merge commit '694b7cd873f8b06af109036eff1ccd741afdd28e' into release/1.1Michael Niedermayer
* commit '694b7cd873f8b06af109036eff1ccd741afdd28e': mpegts: Define the section length with a constant Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28pulse: Add a wallclock option to be compatible with other other capturesLuca Barbato
alsa and x11grab use av_gettime() to report timestamps. Have it on by default. Bug-Id: 647 (cherry picked from commit 424b929b5cb9ca4094099f25179829260d4b0fa3) (cherry picked from commit 404731bd20e1df5880e6fe381e975ba48afc75b2) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-08-27avconv: fix parsing the AVOptions for -targetAnton Khirnov
CC: libav-stable@libav.org (cherry picked from commit f5245a9c6206878b892adf3ccbccc9311c202af5) Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit f7395926f204051af9ad459a6d876b96ee6179ee) Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-08-27avconv: fix the muxrate values for -targetAnton Khirnov
The mpegenc private option values are in 50-byte units. CC: libav-stable@libav.org (cherry picked from commit 1688eef25385089026aba55da1885f70a57815ab) Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit 7bc37641e3e6c24d472ae06fcbecaba4c863829b) Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-08-27mpegenc: limit the maximum muxrateAnton Khirnov
It is written to the file as a 22-bit value. CC: libav-stable@libav.org (cherry picked from commit 75bbaf2493a71ee66eaabe3c21fadd84d07888de) Signed-off-by: Anton Khirnov <anton@khirnov.net> Conflicts: libavformat/mpegenc.c (cherry picked from commit 3ac0638d573fc483ba6be3444858b26711c5d67d) Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-08-12ffv1dec: check that global parameters do not change in version 0/1Michael Niedermayer
Such changes are neither allowed nor supported Found-by: ami_stuff Bug-Id: CVE-2013-7020 CC: libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit da7d839a0d3ec40423a665dc85e0cfaed3f92eb8) Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-08-09Re-release 9.15 as 9.16Reinhard Tartler
This is a clean fixup of the tagging mistake in the v9.15 release
2014-08-09Prepare for 9.15 ReleaseReinhard Tartler
2014-08-09Update Changelog for v9.15Reinhard Tartler
2014-08-09update for 1.1.13n1.1.13Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08avcodec/dvdsub_parser: print message if packet is smaller than the packet ↵Michael Niedermayer
size field Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit bcc898dd2643c883522ffa565be4b226ce798c78) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08avcodec/dvdsub_parser: Check buf_size before reading 32bit packet sizeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 81c1657a593b1c0f8e46fca00ead1d30ee1cd418) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08avcodec/dvdsub_parser: never return 0 when the input isnt 0Michael Niedermayer
Fixes a infinite loop Fixes Ticket3804 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cfdb30d2f1241de9354a8efdbf8252d0f1a6f933) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08avformat/utils: do not wait for packets from discarded streams for genptsMichael Niedermayer
Fixes long loop Fixes Ticket3208 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8202c49b43621c04e26d4a3aa83a10e1e5cc1836) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08Merge commit 'ecda9b90eccc687202fe9fa20f7ca61d92d816b4' into release/1.1Michael Niedermayer
* commit 'ecda9b90eccc687202fe9fa20f7ca61d92d816b4': Update Changelog for v9.15 Conflicts: Changelog Not merged as the changelog doesnt apply 1:1 to FFmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08Merge commit '52254067b312e78d30bbe79fc33dbdf995b22b4e' into release/1.1Michael Niedermayer
* commit '52254067b312e78d30bbe79fc33dbdf995b22b4e': error_concealment: avoid using the picture if not fully setup Conflicts: libavcodec/error_resilience.c See: 68a0477bc0af026db971ddba22541029a9e8715b Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08vp3: Copy all 3 frames for thread updatesMichael Niedermayer
Fixes a double release of the current frame on deinit. Bug-Id: CVE-2011-3934 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-08-08avcodec/svq1dec: Fix multiple bugs from "svq1: do not modify the input packet"Michael Niedermayer
Add padding, clear size, use the correct pointer. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 4213fc5b9eebec53c7d22b770c3f1ceecca1c113) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08Merge commit 'af9b62654d5aa023a96906215365532d18541a09' into release/1.1Michael Niedermayer
* commit 'af9b62654d5aa023a96906215365532d18541a09': svq1: do not modify the input packet Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08Merge commit '80c268eaaee402695a74d14acf76063100692a99' into release/1.1Michael Niedermayer
* commit '80c268eaaee402695a74d14acf76063100692a99': cdgraphics: do not return 0 from the decode function Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08Merge commit '8cd67ddde46a42a33149e7d42a2ab47852ff2a83' into release/1.1Michael Niedermayer
* commit '8cd67ddde46a42a33149e7d42a2ab47852ff2a83': cdgraphics: switch to bytestream2 Conflicts: libavcodec/cdgraphics.c See: ad002e1a13a8df934bd6cb2c84175a4780ab8942 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08Merge commit 'c53effc41b9359261b17c8da3b7062369cafd686' into release/1.1Michael Niedermayer
* commit 'c53effc41b9359261b17c8da3b7062369cafd686': huffyuvdec: check width size for yuv422p Conflicts: libavcodec/huffyuvdec.c See: 6abb9a901fca27da14d4fffbb01948288b5da3ba Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08Merge commit 'ede738880032db62b7dc5b3712f769d3826f5974' into release/1.1Michael Niedermayer
* commit 'ede738880032db62b7dc5b3712f769d3826f5974': mmvideo: check horizontal coordinate too See: See: 8d3c99e825317b7efda5fd12e69896b47c700303 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08Merge commit '36d8914f1b94e4731d2fc67162902839c106e72e' into release/1.1Michael Niedermayer
* commit '36d8914f1b94e4731d2fc67162902839c106e72e': wmalosslessdec: fix mclms_coeffs* array size See: ec9578d54d09b64bf112c2bf7a34b1ef3b93dbd3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08Merge commit '146b187113e3cc20c2a97c5f264da13e701ca247' into release/1.1Michael Niedermayer
* commit '146b187113e3cc20c2a97c5f264da13e701ca247': lavc: Check the image size before calling get_buffer Conflicts: libavcodec/utils.c See: 668494acd8b20f974c7722895d4a6a14c1005f1e Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08Merge commit '43d676432740c6d5e5234ed343f13902909fd124' into release/1.1Michael Niedermayer
* commit '43d676432740c6d5e5234ed343f13902909fd124': huffyuv: Check and propagate function return values Conflicts: libavcodec/huffyuvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08Merge commit '512354191328c559fcff56070dab897ee2a1b4c1' into release/1.1Michael Niedermayer
* commit '512354191328c559fcff56070dab897ee2a1b4c1': h264: prevent theoretical infinite loop in SEI parsing Conflicts: libavcodec/h264_sei.c See: 9decfc17bb76da34734296048d390b176abf404c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08Merge commit '01f9540320279954b2764645ab7136847d53d89f' into release/1.1Michael Niedermayer
* commit '01f9540320279954b2764645ab7136847d53d89f': h264_sei: check SEI size Conflicts: libavcodec/h264_sei.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08Merge commit '00915d3cd2ce61db3d6dc11f63566630a9aff4ec' into release/1.1Michael Niedermayer
* commit '00915d3cd2ce61db3d6dc11f63566630a9aff4ec': pgssubdec: Check RLE size before copying See: c0d68be555f5858703383040e04fcd6529777061 Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 11:21:18 +0300