summaryrefslogtreecommitdiff
path: root/libavutil
Commit message (Collapse)AuthorAgeFilesLines
* samplefmt: avoid integer overflow in av_samples_get_buffer_size()Justin Ruggles2014-02-231-0/+2
| | | | | | | CC:libav-stable@libav.org (cherry picked from commit 0e830094ad0dc251613a0aa3234d9c5c397e02e6) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avutil/log: check that len is within the buffer before reading itMichael Niedermayer2014-01-081-1/+1
| | | | | | | | | | Fixes out of array read Fixes: asan_heap-oob_19d6979_6857_mmw_deadzy.ogg Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 808c10e728db2d92ccbb0f8b3bcd4a2f4305a2cf) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avutil/log: skip IO calls on empty stringsMichael Niedermayer2014-01-071-0/+3
| | | | | | | | | These occur when no context is set for example, thus they are common Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a044a183a3fb90b20a8deaa3ea1158510bcdd420) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avutil: reintroduce lls1 as the 52 ABI needs itMichael Niedermayer2013-11-174-1/+240
| | | | | | | | | | | | | | | | | | | | | | lls1 taken from ff130d7 This is incompatible with libavcodec version 55.18.100 to 55.43.100 except 55.39.101 This incompatibility is caused by these libavcodec versions depending on a libavutil 52 which is ABI incompatible with the previous ABI 52 you can avoid this incompatibility by upgrading your libavcodec so it does no longer depend on the invalid ABI See: 502ab21af0ca68f76d6112722c46d2f35c004053 See: cc6714bb16b1f0716ba43701d47273dbe9657b8b See: 41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2 See: Ticket3136 Tested-by: marillat Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b382d09d29be90e0947295a70cdcbaa60b9030b8) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* rename new lls code to lls2 to avoid conflict with the old which has a ↵Michael Niedermayer2013-11-174-50/+24
| | | | | | | | | | | | | different ABI also remove failed attempt at a compatibility layer, the code simply cannot work Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c3814ab654a993723b0e5f14cc252d68f233ad79) Conflicts: libavcodec/version.h
* avutil: rename lls to lls2Michael Niedermayer2013-11-174-4/+4
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit bbe66ef912470007f7cc424badde2ccec500b36b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavu/parseutils: add av_get_known_color_name()Stefano Sabatini2013-10-273-2/+29
|
* avutil/utils: check that size_t is unsignedMichael Niedermayer2013-10-261-0/+2
| | | | | | | | ANSI/ISO C guarantee this, yet there is evidence that there exist platforms where its not so. See: http://www.cs.utah.edu/dept/old/texinfo/glibc-manual-0.02/library_30.html Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'b284e1ffe343d6697fb950d1ee517bafda8a9844'Michael Niedermayer2013-10-261-2/+2
|\ | | | | | | | | | | | | * commit 'b284e1ffe343d6697fb950d1ee517bafda8a9844': mem: do not check for negative size Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mem: do not check for negative sizeVittorio Giovara2013-10-261-2/+2
| | | | | | | | | | | | size_t is guaranteed to be unsigned Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4'Michael Niedermayer2013-10-263-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4': libavutil: x86: Add AVX2 capable CPU detection. Conflicts: libavutil/cpu.c libavutil/cpu.h libavutil/x86/cpu.c See: 865b70bc5d1cf37ec6d6cb729a69dda2cca28bd5 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavutil: x86: Add AVX2 capable CPU detection.Kieran Kunhya2013-10-254-0/+15
| | | | | | | | | | | | Patch based on x264's AVX2 detection Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * base64-test: Remove posibility of returning restricted exit codesDerek Buitenhuis2013-10-251-1/+4
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * tree-test: Don't return restricted exit codesDerek Buitenhuis2013-10-241-2/+2
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * avstring-test: Mark pointer passed to av_free() as non-constDiego Biurrun2013-10-231-1/+2
| | | | | | | | libavutil/avstring.c:278:9: warning: passing argument 1 of ‘av_free’ discards ‘const’ qualifier from pointer target type
* | Add AVX2 capable CPU detection. Patch based on x264's AVX2 detectionKieran Kunhya2013-10-264-0/+15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | base64-test: Remove posibility of returning restrcted exit codesDerek Buitenhuis2013-10-241-1/+4
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | tree-test: Don't return restricted exit codesDerek Buitenhuis2013-10-241-2/+2
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | avutil/log: document log callback thread saftey requirementsMichael Niedermayer2013-10-231-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/log: make default av_log callback thread safeMichael Niedermayer2013-10-231-2/+14
| | | | | | | | | | | | This uses a pthread mutex Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fix order of operations in commentsMichael Niedermayer2013-10-232-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support FF_DISABLE_DEPRECATION_WARNINGS with icc on Linux.Carl Eugen Hoyos2013-10-211-1/+1
| |
* | avutil/opt: initialize retMichael Niedermayer2013-10-201-1/+1
| | | | | | | | | | | | | | Fixes CID1108610 Fixes use of uninitialized variable Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/file_open: Print debug message if setting close on exec failsMichael Niedermayer2013-10-201-2/+4
| | | | | | | | | | Fixes CID1087079 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Do not leave positive values undefined when negative are defined as errorMichael Niedermayer2013-10-193-4/+4
| | | | | | | | | | | | | | | | Define positive return values as non errors and leave further meaning undefined This allows future extensions to use these values Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavu/opt: add AV_OPT_TYPE_CHANNEL_LAYOUT and handler functionsStefano Sabatini2013-10-173-3/+78
| | | | | | | | | | The new type is compatible with AV_OPT_TYPE_INT64, but allows to specify channel layouts using the format accepted by av_get_channel_layout().
* | lavu/channel_layout: change av_get_channel_layout() behavior at the next bumpStefano Sabatini2013-10-174-3/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new syntax is preferred since it allows backward syntax compatibility with libswr when switching to the new option handling code with AV_OPT_TYPE_CHANNEL_LAYOUT. With the new parser the string: 1234 is interpreted as a channel layout mask, rather than as a number of channels, and thus it's compatible with the current way to set a channel layout as an integer (e.g. for the icl and ocl options) making use of integer option values. ff_get_channel_layout() with compat=0 will be used in the AV_OPT_TYPE_CHANNEL handler code. The user is encouraged to switch to the new forward compatible syntax, which requires to put a trailing "c" when specifying a layout as a number of channels.
* | lavu/opt.h: fix grammar typo in av_opt_get* doxyStefano Sabatini2013-10-171-1/+1
| |
* | lavu/opt-test: use automatic set and free handlersStefano Sabatini2013-10-171-3/+2
| | | | | | | | | | In particular, do not set default string value by hand and use av_opt_free() to free context.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-171-1/+1
|\ \ | |/ | | | | | | | | | | * qatar/master: mem: Make av_strdup allocate using av_realloc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mem: Make av_strdup allocate using av_reallocMartin Storsjö2013-10-161-1/+1
| | | | | | | | | | | | | | | | | | This makes sure that pointers from av_strdup are reallocable, which is used in av_dict_set if the AV_DICT_APPEND flag is set. Nothing should rely on pointers from av_strdup being aligned. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avutil/log: fix race between setting and using the log callbackMichael Niedermayer2013-10-171-2/+3
| | | | | | | | | | Found-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-141-0/+11
|\ \ | |/ | | | | | | | | | | * qatar/master: x86: more AVX2 framework Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: more AVX2 frameworkJason Garrett-Glaser2013-10-141-0/+11
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit 'c6908d6b4b377a04a5d055ba874bdbcf06c80497'Michael Niedermayer2013-10-142-1/+45
|\ \ | |/ | | | | | | | | | | * commit 'c6908d6b4b377a04a5d055ba874bdbcf06c80497': x86inc: FMA3/4 Support Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86inc: FMA3/4 SupportJason Garrett-Glaser2013-10-142-1/+45
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '206895708ea2b464755d340e44501daf9a07c310'Michael Niedermayer2013-10-142-11/+16
|\ \ | |/ | | | | | | | | | | * commit '206895708ea2b464755d340e44501daf9a07c310': x86inc: Remove our FMA4 support Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86inc: Remove our FMA4 supportDerek Buitenhuis2013-10-142-11/+16
| | | | | | | | | | | | | | | | This is so we can sync to x264's version of FMA4 support. This partialy reverts commit 79687079a97a039c325ab79d7a95920d800b791f. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit 'c108ba0175d4fc3a3253a8b0f782fbfb96ba5098'Michael Niedermayer2013-10-141-84/+169
|\ \ | |/ | | | | | | | | | | * commit 'c108ba0175d4fc3a3253a8b0f782fbfb96ba5098': x86inc: Use VEX-encoded instructions in AVX functions Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86inc: Use VEX-encoded instructions in AVX functionsHenrik Gramner2013-10-141-84/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | Automatically use VEX-encoding in AVX/AVX2/XOP/FMA3/FMA4 functions for all instructions that exists in a VEX-encoded version. This change makes it easier to extend existing code to use AVX2. Also add support for AVX emulation of a few instructions that were missing before. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-091-30/+5
|\ \ | |/ | | | | | | | | | | | | | | | | * qatar/master: x86inc: Remove .rodata kludges Conflicts: libavutil/x86/x86inc.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86inc: Remove .rodata kludgesHenrik Gramner2013-10-091-11/+5
| | | | | | | | | | | | | | The Mach-O bug was fixed in yasm 0.8.0 and we don't support versions that old anymore. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '3e2fa991db7ef172579422accd61624d52777e5a'Michael Niedermayer2013-10-081-5/+4
|\ \ | |/ | | | | | | | | | | * commit '3e2fa991db7ef172579422accd61624d52777e5a': x86inc: remove misaligned cpu flag Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86inc: remove misaligned cpu flagHenrik Gramner2013-10-071-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | Prevents a crash if the misaligned exception mask bit is cleared for some reason. Misaligned SSE functions are only used on AMD Phenom CPUs and the benefit is miniscule. They also require modifying the MXCSR control register and by removing those functions we can get rid of that complexity altogether. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '71155665414b551ad350622d5abed20e58371fbf'Michael Niedermayer2013-10-081-3/+2
|\ \ | |/ | | | | | | | | | | * commit '71155665414b551ad350622d5abed20e58371fbf': x86inc: various minor backports from x264 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86inc: various minor backports from x264Jason Garrett-Glaser2013-10-071-4/+3
| | | | | | | | | | | | Small backports that sneaked into other asm commits in x264. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '47f9d7ce5493e119e09d1227d017414feaaf8d97'Michael Niedermayer2013-10-081-0/+2
|\ \ | |/ | | | | | | | | | | * commit '47f9d7ce5493e119e09d1227d017414feaaf8d97': x86inc: Check for __OUTPUT_FORMAT__ having a value of "x64" Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86inc: Check for __OUTPUT_FORMAT__ having a value of "x64"Derek Buitenhuis2013-10-071-0/+2
| | | | | | | | | | | | This is also a valid value for WIN64. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit 'bbe4a6db44f0b55b424a5cc9d3e89cd88e250450'Michael Niedermayer2013-10-081-37/+46
|\ \ | |/ | | | | | | | | | | * commit 'bbe4a6db44f0b55b424a5cc9d3e89cd88e250450': x86inc: Utilize the shadow space on 64-bit Windows Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86inc: Utilize the shadow space on 64-bit WindowsHenrik Gramner2013-10-071-37/+46
| | | | | | | | | | | | | | | | | | Store XMM6 and XMM7 in the shadow space in functions that clobbers them. This way we don't have to adjust the stack pointer as often, reducing the number of instructions as well as code size. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>