aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '802727b538b484e3f9d1345bfcc4ab24cfea8898'James Almer2017-03-193-21/+21
|\ | | | | | | | | | | | | * commit '802727b538b484e3f9d1345bfcc4ab24cfea8898': vp8: Update some assembly comments left unchanged in bd66f073fe7286bd3c Merged-by: James Almer <jamrial@gmail.com>
| * vp8: Update some assembly comments left unchanged in bd66f073fe7286bd3cDiego Biurrun2016-08-263-21/+21
| |
* | Merge commit '87c6c78604e4dd16f1f45862b27ca006da010527'James Almer2017-03-193-13/+14
|\| | | | | | | | | | | | | * commit '87c6c78604e4dd16f1f45862b27ca006da010527': vp8: Change type of stride parameters to ptrdiff_t Merged-by: James Almer <jamrial@gmail.com>
| * vp8: Change type of stride parameters to ptrdiff_tDiego Biurrun2016-08-263-12/+13
| | | | | | | | ptrdiff_t is the correct type for array strides and similar.
* | Merge commit 'd9d26a3674f31f482f54e936fcb382160830877a'James Almer2017-03-198-20/+20
|\| | | | | | | | | | | | | * commit 'd9d26a3674f31f482f54e936fcb382160830877a': vp56: Change type of stride parameters to ptrdiff_t Merged-by: James Almer <jamrial@gmail.com>
| * vp56: Change type of stride parameters to ptrdiff_tDiego Biurrun2016-08-268-20/+20
| | | | | | | | | | This avoids SIMD-optimized functions having to sign-extend their line size argument manually to be able to do pointer arithmetic.
* | Merge commit '6892df9294d93322d43255ada299507465bc93c8'Clément Bœsch2017-03-196-39/+27
|\| | | | | | | | | | | | | * commit '6892df9294d93322d43255ada299507465bc93c8': vp3: Change type of stride parameters to ptrdiff_t Merged-by: Clément Bœsch <u@pkh.me>
| * vp3: Change type of stride parameters to ptrdiff_tDiego Biurrun2016-08-266-39/+27
| | | | | | | | | | | | | | This avoids SIMD-optimized functions having to sign-extend their stride argument manually to be able to do pointer arithmetic. Also adjust parameter names to be "stride" everywhere.
* | Merge commit '963b3ab11f98fcc4a311f0dc7b268890c5675da2'Clément Bœsch2017-03-191-0/+5
|\| | | | | | | | | | | | | * commit '963b3ab11f98fcc4a311f0dc7b268890c5675da2': doc: Document FATE option HWACCEL Merged-by: Clément Bœsch <u@pkh.me>
| * doc: Document FATE option HWACCELLuca Barbato2016-08-261-0/+5
| |
* | Merge commit 'd42809f9835a4e9e5c7c63210abb09ad0ef19cfb'Clément Bœsch2017-03-194-1/+10
|\| | | | | | | | | | | | | * commit 'd42809f9835a4e9e5c7c63210abb09ad0ef19cfb': av1: Add codec_id and basic demuxing support Merged-by: Clément Bœsch <u@pkh.me>
| * av1: Add codec_id and basic demuxing supportLuca Barbato2016-08-244-0/+10
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '24130234cd9dd733116d17b724ea4c8e12ce097a'Clément Bœsch2017-03-191-3/+14
|\| | | | | | | | | | | | | | | | | * commit '24130234cd9dd733116d17b724ea4c8e12ce097a': rtpdec_mpeg4: validate fmtp fields Merged with fixed log message. Merged-by: Clément Bœsch <u@pkh.me>
| * rtpdec_mpeg4: validate fmtp fieldsLuca Barbato2016-08-231-3/+14
| |
* | Merge commit '46e3936fb04d06550151e667357065e3f646da1a'Clément Bœsch2017-03-191-0/+2
|\| | | | | | | | | | | | | * commit '46e3936fb04d06550151e667357065e3f646da1a': configure: Set __MSVCRT_VERSION__to 0x0700 for MinGW Merged-by: Clément Bœsch <u@pkh.me>
| * configure: Set __MSVCRT_VERSION__to 0x0700 for MinGWDiego Biurrun2016-08-231-0/+2
| | | | | | | | | | This exposes some required functionality like _aligned_malloc() in the MinGW system headers, thus obviating the need for the memalign hack.
* | Merge commit '6755eb5b212384e0599f7f2c5de42df49fff57de'Clément Bœsch2017-03-190-0/+0
|\| | | | | | | | | | | | | | | | | * commit '6755eb5b212384e0599f7f2c5de42df49fff57de': mss12: validate display dimensions This commit is a noop, see ee9151b616fa7fa5e9b3258ecafd00c9f784baaa Merged-by: Clément Bœsch <u@pkh.me>
| * mss12: validate display dimensionsAnton Khirnov2016-08-181-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | The code currently reads the coded dimensions from the extradata, but expects the display dimensions to be set by the caller, and does not check that they are compatible (i.e. that the displayed size is smaller than the coded size). Make sure that when the display dimensions are set, they are also valid. Fixes possible invalid memory access. CC: libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
* | Merge commit '33f10546ec012ad4e1054b57317885cded7e953e'Clément Bœsch2017-03-190-0/+0
|\| | | | | | | | | | | | | | | | | * commit '33f10546ec012ad4e1054b57317885cded7e953e': vc1: check that slices have a positive height This commit is a noop, see e985cfd18bc416d3ff0c83ccafdc1ac733e6d522 Merged-by: Clément Bœsch <u@pkh.me>
| * vc1: check that slices have a positive heightAnton Khirnov2016-08-181-0/+6
| | | | | | | | | | | | | | Fixes possible invalid reads. CC: libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
* | Merge commit '09b23786b3986502ee88d4907356979127169bdd'Clément Bœsch2017-03-190-0/+0
|\| | | | | | | | | | | | | | | | | * commit '09b23786b3986502ee88d4907356979127169bdd': pcx: use the bytestream2 API for reading from input This commit is a noop, see 8cd1c0febe88b757e915e9af15559575c21ca728 Merged-by: Clément Bœsch <u@pkh.me>
| * pcx: use the bytestream2 API for reading from inputAnton Khirnov2016-08-181-44/+29
| | | | | | | | | | | | | | Fixes possible invalid reads. CC: libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
* | Merge commit '221402c1c88b9d12130c6f5834029b535ee0e0c5'Clément Bœsch2017-03-191-1/+5
|\| | | | | | | | | | | | | | | | | * commit '221402c1c88b9d12130c6f5834029b535ee0e0c5': pcx: check that the packet is large enough before reading the header See 8cd1c0febe88b757e915e9af15559575c21ca728 Merged-by: Clément Bœsch <u@pkh.me>
| * pcx: check that the packet is large enough before reading the headerAnton Khirnov2016-08-181-0/+7
| | | | | | | | | | | | | | Fixes possible invalid reads. CC: libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
* | Merge commit '15ee419b7abaf17f8c662c145fe93d3dbf43282b'Clément Bœsch2017-03-190-0/+0
|\| | | | | | | | | | | | | | | | | * commit '15ee419b7abaf17f8c662c145fe93d3dbf43282b': pcx: properly pad the scanline This commit is a noop, see d24de4596c3f980c9cc1cb5c8706c8411e46275b Merged-by: Clément Bœsch <u@pkh.me>
| * pcx: properly pad the scanlineAnton Khirnov2016-08-181-1/+1
| | | | | | | | | | | | | | | | | | It is passed to the get_bits API, which requires buffers to be padded. Fixes possible invalid reads. CC: libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
* | Merge commit '409d1cd2c955485798f8b0b0147c2b899b9144ec'Clément Bœsch2017-03-191-23/+15
|\| | | | | | | | | | | | | * commit '409d1cd2c955485798f8b0b0147c2b899b9144ec': cook: use the bytestream2 API for reading extradata Merged-by: Clément Bœsch <u@pkh.me>
| * cook: use the bytestream2 API for reading extradataAnton Khirnov2016-08-181-19/+12
| | | | | | | | | | | | | | Fixes possible invalid reads in corrupted files. CC: libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
* | Merge commit 'bba9d8bdfb208b0ec2ccf182530347151ee3528b'Clément Bœsch2017-03-191-1/+1
|\| | | | | | | | | | | | | | | | | * commit 'bba9d8bdfb208b0ec2ccf182530347151ee3528b': qpeg: fix an off by 1 error in the MV check See dd3bfe3cc1ca26d0fff3a3baf61a40207032143f Merged-by: Clément Bœsch <u@pkh.me>
| * qpeg: fix an off by 1 error in the MV checkAnton Khirnov2016-08-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | height - me_y is the line from which we read, so it must be strictly smaller than the frame height. Fixes possible invalid reads in corrupted files. Also, use a proper context for logging the error. CC: libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
* | Merge commit '796dca027be09334d7bbf4f2ac1200e06bb054cb'Clément Bœsch2017-03-191-1/+1
|\| | | | | | | | | | | | | | | | | * commit '796dca027be09334d7bbf4f2ac1200e06bb054cb': alac: do not return success if nothing was decoded See e11983bda073f8c63f60509ee753da9fba20ed10 Merged-by: Clément Bœsch <u@pkh.me>
| * alac: do not return success if nothing was decodedAnton Khirnov2016-08-181-0/+4
| | | | | | | | | | | | | | | | | | If we encounter an END element before anything is decoded, we would return success even though the output frame has not been allocated, which is invalid. CC: libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
* | Merge commit 'f5d46d332258dcd8ca623019ece1d5e5bb74142b'Clément Bœsch2017-03-191-4/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f5d46d332258dcd8ca623019ece1d5e5bb74142b': vmnc: check that subrectangles fit into their containing rectangles See 6ba02602aa7fc7d38db582e75b8b093fb3c1608d This merge keeps our condition against w-i and h-j instead of bw and bh. One may be more correct than the other, but I'm keeping our behaviour here for safety reasons. The style and formatting is merged. Merged-by: Clément Bœsch <u@pkh.me>
| * vmnc: check that subrectangles fit into their containing rectanglesAnton Khirnov2016-08-181-2/+14
| | | | | | | | | | | | | | Fixes possible invalid writes with corrupted files. CC: libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
* | Merge commit '83b92a855e8e08bdec484e13ee5a7c8996224772'Clément Bœsch2017-03-191-10/+0
|\| | | | | | | | | | | | | * commit '83b92a855e8e08bdec484e13ee5a7c8996224772': golomb: Drop disabled cruft Merged-by: Clément Bœsch <u@pkh.me>
| * golomb: Drop disabled cruftDiego Biurrun2016-08-171-16/+0
| |
* | Merge commit '014852e932dab6e9cf2a53e7a17ce8321f3e922c'Clément Bœsch2017-03-191-7/+0
|\| | | | | | | | | | | | | * commit '014852e932dab6e9cf2a53e7a17ce8321f3e922c': simple_idct: arm: Drop disabled code variant Merged-by: Clément Bœsch <u@pkh.me>
| * simple_idct: arm: Drop disabled code variantDiego Biurrun2016-08-171-7/+0
| |
* | Merge commit 'e2b9993558b6adee42dcc6eb385a14943aaca974'Clément Bœsch2017-03-191-255/+0
|\| | | | | | | | | | | | | * commit 'e2b9993558b6adee42dcc6eb385a14943aaca974': simple_idct: x86: Drop disabled IDCT implementation Merged-by: Clément Bœsch <u@pkh.me>
| * simple_idct: x86: Drop disabled IDCT implementationDiego Biurrun2016-08-171-255/+0
| | | | | | | | This gem has been disabled since 2001.
* | Merge commit '7effebde78977fafce935776153ea2f7c0981fa3'Clément Bœsch2017-03-191-60/+2
|\| | | | | | | | | | | | | * commit '7effebde78977fafce935776153ea2f7c0981fa3': dvbsubdec: Remove disabled, near-duplicate debug code Merged-by: Clément Bœsch <u@pkh.me>
| * dvbsubdec: Remove disabled, near-duplicate debug codeDiego Biurrun2016-08-171-60/+2
| |
* | Merge commit '93fed46a92bab8be176d3e67be4354189a8dbe7f'Clément Bœsch2017-03-191-13/+0
|\| | | | | | | | | | | | | * commit '93fed46a92bab8be176d3e67be4354189a8dbe7f': timefilter: test: Drop some disabled debug cruft Merged-by: Clément Bœsch <u@pkh.me>
| * timefilter: test: Drop some disabled debug cruftDiego Biurrun2016-08-171-13/+0
| |
* | Merge commit '0e285c2f908789e96e29bfd969ad5eaaa0eece65'Clément Bœsch2017-03-192-18/+0
|\| | | | | | | | | | | | | * commit '0e285c2f908789e96e29bfd969ad5eaaa0eece65': mpegvideo: Kill some disabled code Merged-by: Clément Bœsch <u@pkh.me>
| * mpegvideo: Kill some disabled codeDiego Biurrun2016-08-172-18/+0
| |
* | Merge commit 'f2f145f3032bc8808708a4bd694fbce5f1b8b63c'Clément Bœsch2017-03-192-12/+0
|\| | | | | | | | | | | | | * commit 'f2f145f3032bc8808708a4bd694fbce5f1b8b63c': msmpeg4: Drop disabled debug cruft Merged-by: Clément Bœsch <u@pkh.me>
| * msmpeg4: Drop disabled debug cruftDiego Biurrun2016-08-172-12/+0
| |
* | Merge commit 'be1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e'Clément Bœsch2017-03-191-10/+0
|\| | | | | | | | | | | | | * commit 'be1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e': mathops: Drop disabled alternative mid_pred() implementation Merged-by: Clément Bœsch <u@pkh.me>
| * mathops: Drop disabled alternative mid_pred() implementationDiego Biurrun2016-08-171-10/+0
| |