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-01-06Merge commit '5b4797a21db900b7d509660b7a4d49829089b004'Michael Niedermayer
* commit '5b4797a21db900b7d509660b7a4d49829089b004': avframe: add AV_FRAME_DATA_MATRIXENCODING side data type. Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-06Merge commit '5c437fb'Michael Niedermayer
* commit '5c437fb': lavu: Add values for various Dolby flags to the AVMatrixEncoding enum. Conflicts: doc/APIchanges libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-05avframe: add AV_FRAME_DATA_MATRIXENCODING side data type.Tim Walker
Includes a libavcodec utility function to update a frame's side data.
2014-01-05lavu: Add values for various Dolby flags to the AVMatrixEncoding enum.Tim Walker
2014-01-04avutil/mathematics: add av_add_stable()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-23avutil/avstring: add av_strnlen()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-21Merge commit '2a41826bea3833895dc06939831b7f35ca1f597e'Michael Niedermayer
* commit '2a41826bea3833895dc06939831b7f35ca1f597e': lavc: add HEVC profiles names Conflicts: libavcodec/hevc.c libavcodec/version.h See: fb7d70c1cd95529cbbbeeab5e9fa3b200ef2545c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-20lavc: add HEVC profiles namesGildas Cocherel
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-12-18Revert "Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'" (Bump ↵Michael Niedermayer
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
2013-12-17Merge commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d'Michael Niedermayer
* commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d': Bump major of libavfilter for reference counted buffer API changes. Conflicts: libavfilter/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-17Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'Michael Niedermayer
* 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>
2013-12-15Bump major of libavfilter for reference counted buffer API changes.Reinhard Tartler
Applications that have been linked against an older release of Libav and pick up updated libraries experience segmentation faults because they pick up the new libavfilter, which assumes AVFrames have been allocated by libavutil and thus contain new reference-counting related fields. This will break for AVFrames that have been allocated by old libavcodec. All scheduled API changes are deferred to the next bump.
2013-12-15Bump libavutil major version to account for the LLS API/ABI changes.Reinhard Tartler
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.
2013-12-12Merge commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671'Michael Niedermayer
* commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671': lavc: deprecate avcodec_get_frame_defaults(). Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-11lavc: deprecate avcodec_get_frame_defaults().Anton Khirnov
Also bump libavcodec micro and add an APIchanges entry saying that av_frame_* should now be used instead of the lavc AVFrame functions.
2013-12-10Merge commit '7e244c68600f479270e979258e389ed5240885fb'Michael Niedermayer
* commit '7e244c68600f479270e979258e389ed5240885fb': avframe: add codec-independent stereoscopic metadata Conflicts: Changelog libavutil/Makefile libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-10cmdutils & opencl: add -opencl_bench option to test and show available ↵Lenny Wang
OpenCL devices Reviewed-by: Wei Gao <highgod0401@gmail.com> Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09avframe: add codec-independent stereoscopic metadataVittorio Giovara
2013-12-01build: rename version.h to libavutil/ffversion.hTimothy Gu
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>
2013-11-26Merge commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025'Michael Niedermayer
* commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025': mpeg12dec: Extract CC user data into frame side data Conflicts: doc/APIchanges libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-26mpeg12dec: Extract CC user data into frame side dataJohn Stebbins
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-22lavu/avstring: add av_utf8_decode() functionStefano Sabatini
2013-11-20Document new APIs for av_packet_{un, }pack_dictionary()Ben Boeckel
Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Reveiwed-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-14Merge commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4'Michael Niedermayer
* commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4': Move av_fast_{m,re}alloc from lavc to lavu. Conflicts: libavcodec/avcodec.h libavcodec/utils.c libavutil/mem.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-14Merge commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65'Michael Niedermayer
* commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65': lavc: make error_rate a private option of mpegvideo encoders Conflicts: libavcodec/options_table.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-14Merge commit '728c4658563dc82115ade0f1679679eddb7be5ff'Michael Niedermayer
* commit '728c4658563dc82115ade0f1679679eddb7be5ff': vdpau: add a constructor for AVVDPAUContext. Conflicts: libavcodec/vdpau.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-14Merge commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118'Michael Niedermayer
* commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118': vdpau: add a convenience function for getting a decoder profile. Conflicts: doc/APIchanges libavcodec/vdpau.c libavcodec/vdpau.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-14Move av_fast_{m,re}alloc from lavc to lavu.Anton Khirnov
2013-11-14lavc: make error_rate a private option of mpegvideo encodersAnton Khirnov
2013-11-14vdpau: add a constructor for AVVDPAUContext.Anton Khirnov
We will likely want to add new fields to it in the future, so this is needed to avoid breaking ABI.
2013-11-14vdpau: add a convenience function for getting a decoder profile.Anton Khirnov
Based on the code by Rémi Denis-Courmont <remi@remlab.net> from VLC.
2013-11-05Merge commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212'Michael Niedermayer
* commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212': lavc: Add colorimetry values for BT.2020, other non-included ones Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04lavc: Add colorimetry values for BT.2020, other non-included onesJan Ekström
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2013-11-04avutil: add av_fopen_utf8()Michael Niedermayer
fopen() on windows uses UTF-16, we use UTF-8 everywhere, this function bridges the gap by using avpriv_open() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01Merge commit '28096e0a806e57376541e6222d315619906e3c55'Michael Niedermayer
* commit '28096e0a806e57376541e6222d315619906e3c55': h264: wait for initial complete frame before outputing frames Conflicts: doc/APIchanges libavcodec/h264.c libavcodec/mpegvideo.h libavutil/frame.h libavutil/version.h See: a64b028aeb6579636e578ceb73f69b468bddb2f0 (as well as various later commits) Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-31h264: wait for initial complete frame before outputing framesJohn Stebbins
This can be optionally disabled whith the "output_corrupt" flags option. When in "output_corrupt" mode, incomplete frames are signalled through AVFrame.flags FRAME_FLAG_INCOMPLETE_FRAME. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-28doc/APIchanges: add 2 missing hashes & versionsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28lavc: add support for CODEC_CAP_DELAY in subtitlesMarton Balint
This patch adds CODEC_CAP_DELAY support to avcodec_decode_subtitle2. For DVB teletext decoding, a single teletext packet can contain multiple teletext pages. In order to support that, the teletext decoder may buffer some pages. Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27lavu/parseutils: add av_get_known_color_name()Stefano Sabatini
2013-10-17lavu/opt: add AV_OPT_TYPE_CHANNEL_LAYOUT and handler functionsStefano Sabatini
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().
2013-10-06swscale/options: switch default to bicubicMichael Niedermayer
Suggested-by: Ronald S. Bultje Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03avcodec: add av_codec_get_max_lowres()Michael Niedermayer
Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03avformat: add support to force specific AVCodecsMichael Niedermayer
previously only codec_ids could be forced, which did not allow forcing a specific implementation like libopenjpeg vs jpeg2000. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-28Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: lavfi: allow user-provided execute() callbacks Conflicts: libavfilter/avfilter.h libavfilter/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-28lavfi: allow user-provided execute() callbacksAnton Khirnov
2013-09-22Merge commit 'e208e6d209728d332343aa5390ae377ac0a6305c'Michael Niedermayer
* commit 'e208e6d209728d332343aa5390ae377ac0a6305c': lavu: Add interleaved 4:2:2 8/10-bit formats Conflicts: doc/APIchanges libavutil/pixdesc.c libavutil/pixfmt.h libavutil/version.h See: 90ca5a9b5fc3f1484c389a44f40ee1af4b8f435e Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-21lavu: Add interleaved 4:2:2 8/10-bit formatsKieran Kunhya
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-09-19doc: Add missing hashes and dates to APIChangesPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-19doc/APIchanges: Fix two hashesJames Almer
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-18doc/APIchanges: List merge commit hashes and version numbersMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>