summaryrefslogtreecommitdiff
path: root/libavutil
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-12-20
|\ | | | | | | | | | | | | * qatar/master: atomics: cosmetics: Restructure ifdefs for greater clarity Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * atomics: cosmetics: Restructure ifdefs for greater clarityDiego Biurrun2013-12-20
| | | | | | | | | | Also fix the #endif comment in a few places and #include config.h to avoid assuming it is #included implicitly.
* | Revert "Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'" (Bump ↵Michael Niedermayer2013-12-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libavutil major version to account for the LLS API/ABI changes.) This reverts commit 792845e436ddc5f3ce11ba02535a3372919061f2, reversing changes made to 1d6666a6b828cca6c6b355a9b62f25607b1ced08. Bumping libavutil requires all libraries that use libavutil to have their major version bumped (yes breakage has been confirmed this is not a hypotheses) One case of breakage is due to new types being added to AVOptions and applications that linked to old libavutil and libswresample then trying to use old libavutil (its soname changed so the old isnt updated) and new swresample (its soame didnt change so it is updated) the new swresample contains AVOption types that the old libavutil doesnt know of thus the application attempting to access these avoptions fails AVOptions are used by all libs so the issue can potentially happen with any other lib, libswresample was just the first that showed the problem ive not checked if the other libs are affected currently by the same issue or not Also in addition to AVOptions, AVFrames are also defined in libavutil, bumping it without all libs that use AVFrames could lead to serious inconsistencies when 2 libs/app end up using 2 different libavutils The alternative of bumping all is still possible after this revert, if it turns out to be the preferred solution
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-12-17
|\| | | | | | | | | | | | | * qatar/master: apidoc: fix warning from stereo3d.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * apidoc: fix warning from stereo3d.hVittorio Giovara2013-12-17
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-12-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avutil: Remove deprecated intfloat_readwrite code Conflicts: libavutil/intfloat_readwrite.c libavutil/intfloat_readwrite.h The files are left in place as they are still used by some projects mplayer is one. Theres no hurry in removing the code, it can as well be removed once no projects use it anymore Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avutil: Remove deprecated intfloat_readwrite codeDiego Biurrun2013-12-16
| | | | | | | | It was deprecated over two years ago.
* | Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'Michael Niedermayer2013-12-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c': Bump libavutil major version to account for the LLS API/ABI changes. Conflicts: libavutil/version.h Bump done to stay compatible with libav, its not neccessary otherwise for ffmpeg as we have the new ABI/API under LLS2 and the old (unused) under LLS Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Bump libavutil major version to account for the LLS API/ABI changes.Reinhard Tartler2013-12-14
| | | | | | | | | | | | | | | | Commit 41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2 changed the LLS API, which was called from libavcodec. Thus using an old libavcodec with a new libavutil will break. All scheduled API changes are deferred to the next bump.
* | lavu/dict.h: extend/clarify av_dict_get() doxyStefano Sabatini2013-12-16
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-12-14
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doxy: Define a group for libswscale documentation Conflicts: libavutil/avutil.h libswscale/swscale.h See: 18d9398143ac63915e85d76447dca5c9670ed58a Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxy: Define a group for libswscale documentationLuca Barbato2013-12-13
| | | | | | | | Uniform the style and eliminate a warning on newer doxygen version..
* | Merge commit '70a7b24d56a823894440a372c46e89e212b89c35'Michael Niedermayer2013-12-14
|\| | | | | | | | | | | | | * commit '70a7b24d56a823894440a372c46e89e212b89c35': avutil: Add deprecation ifdefs around obsolete intfloat code Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avutil: Add deprecation ifdefs around obsolete intfloat codeDiego Biurrun2013-12-13
| | | | | | | | This long-deprecated code should disappear at the next version bump.
* | Merge commit '6b45f05ef5b241fd1513702119af9c30056a0ac5'Michael Niedermayer2013-12-12
|\| | | | | | | | | | | | | | | | | | | | | * commit '6b45f05ef5b241fd1513702119af9c30056a0ac5': parseutils: fix discarding const attribute warning Conflicts: libavutil/parseutils.c See: fe87b2e79c734a111747a239943c7340f8d3f7d7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * parseutils: fix discarding const attribute warningVittorio Giovara2013-12-12
| |
* | avutil/avstring: fix () positionMichael Niedermayer2013-12-11
| | | | | | | | | | | | Fixes CID1135751 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7e244c68600f479270e979258e389ed5240885fb'Michael Niedermayer2013-12-09
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '7e244c68600f479270e979258e389ed5240885fb': avframe: add codec-independent stereoscopic metadata Conflicts: Changelog libavutil/Makefile libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avframe: add codec-independent stereoscopic metadataVittorio Giovara2013-12-09
| |
* | cmdutils & opencl: add -opencl_bench option to test and show available ↵Lenny Wang2013-12-09
| | | | | | | | | | | | | | | | OpenCL devices Reviewed-by: Wei Gao <highgod0401@gmail.com> Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654'Michael Niedermayer2013-12-09
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd64341e498fa46c6cf4c23d408177d7489559654': configure: Prefix libc-related variables with "libc_" Conflicts: libavdevice/Makefile libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Prefix libc-related variables with "libc_"Diego Biurrun2013-12-09
| | | | | | | | Simplifies host/target libc detection splitting.
* | Merge commit 'df7aba52b51007db50410abe15fe28391abd8757'Michael Niedermayer2013-12-09
|\| | | | | | | | | | | | | | | | | | | * commit 'df7aba52b51007db50410abe15fe28391abd8757': frame: cosmetics, reindent Conflicts: libavutil/frame.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * frame: cosmetics, reindentAnton Khirnov2013-12-09
| |
* | Merge commit 'c342132fa8a29692e28c98238e3a31da5c407e42'Michael Niedermayer2013-12-09
|\| | | | | | | | | | | | | | | | | | | * commit 'c342132fa8a29692e28c98238e3a31da5c407e42': frame: copy flags in av_frame_copy_props() Conflicts: libavutil/frame.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * frame: copy flags in av_frame_copy_props()Anton Khirnov2013-12-09
| | | | | | | | Flags can be considered metadata (at least those that are defined now).
* | avutil/opt: Implement av_opt_set_defaults* in O(N) instead of O(N²) timeMichael Niedermayer2013-12-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/opt: factor set_string_color() outMichael Niedermayer2013-12-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/opt: factor set_string_video_rate() outMichael Niedermayer2013-12-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/opt: factor set_string_image_size() outMichael Niedermayer2013-12-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/utils: run ff_check_pixfmt_descriptors() only when ASSERT_LEVEL is > 0Michael Niedermayer2013-12-06
| | | | | | | | | | | | this safes about 0.1ms Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/log: skip IO calls on empty stringsMichael Niedermayer2013-12-06
| | | | | | | | | | | | These occur when no context is set for example, thus they are common Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/log: skip setting color for default (AV_LOG_INFO) levelMichael Niedermayer2013-12-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/log: merge calls that set ansi color and print the stringMichael Niedermayer2013-12-06
| | | | | | | | | | | | about 1/3 or so faster Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add Windows resource file support for shared librariesJames Almer2013-12-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally written by James Almer <jamrial@gmail.com> With the following contributions by Timothy Gu <timothygu99@gmail.com> * Use descriptions of libraries from the pkg-config file generation function * Use "FFmpeg Project" as CompanyName (suggested by Alexander Strasser) * Use "FFmpeg" for ProductName as MSDN says "name of the product with which the file is distributed" [1]. * Use FFmpeg's version (N-xxxxx-gxxxxxxx) for ProductVersion per MSDN [1]. * Only build the .rc files when --enable-small is not enabled. [1] http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058.aspx Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavutil & opencl: remove opencl default device typeLenny Wang2013-12-02
| | | | | | | | | | | | | | | | | | CL_DEVICE_TYPE_DEFAULT makes duplicated device entries for each platform using av_opencl_get_device_list() Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Reviewed-by: highgod0401 <highgod0401@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | build: rename version.h to libavutil/ffversion.hTimothy Gu2013-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also the libavutil/ffversion.h will be installed. Rationale: * Applications might want to know FFmpeg's version besides the individual libraries'. * Avoids file name clash between FFmpeg's ./version.h and lib*/version.h when a library source file includes both and is compiled on an out-of-tree build. Fixes #1769. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/log: check that len is within the buffer before reading itMichael Niedermayer2013-11-27
| | | | | | | | | | | | | | 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>
* | get_audio_buffer: fix usage where channels are not set but layout isMichael Niedermayer2013-11-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025'Michael Niedermayer2013-11-26
|\| | | | | | | | | | | | | | | | | | | | | * commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025': mpeg12dec: Extract CC user data into frame side data Conflicts: doc/APIchanges libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg12dec: Extract CC user data into frame side dataJohn Stebbins2013-11-26
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Add missing #includes for *INT64_MAX and *INT64_C Conflicts: ffmpeg.c ffmpeg_filter.c ffplay.c libavformat/assdec.c libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add missing #includes for *INT64_MAX and *INT64_CDiego Biurrun2013-11-23
| |
* | avutil/utf8: put under #ifdef TESTMichael Niedermayer2013-11-22
| | | | | | | | | | | | | | All other test programs are under #ifdef TEST too with the implementation and test code being generally in the same file Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavu/avstring: add av_utf8_decode() functionStefano Sabatini2013-11-22
| |
* | lavu/dict.h: extend/clarify docs for av_dict_parse_string()Stefano Sabatini2013-11-22
| |
* | lavu/dict.h: apply various fixes/extensions to doxyStefano Sabatini2013-11-22
| | | | | | | | | | In particular, document AV_DICT_MATCH_CASE, AV_DICT_IGNORE_SUFFIX, and extend documentation for av_dict_get().
* | avutil: reintroduce lls1 as the 52 ABI needs itMichael Niedermayer2013-11-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | rename new lls code to lls2 to avoid conflict with the old which has a ↵Michael Niedermayer2013-11-17
| | | | | | | | | | | | | | | | different ABI also remove failed attempt at a compatibility layer, the code simply cannot work Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil: rename lls to lls2Michael Niedermayer2013-11-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-19 15:46:30 +0000