generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
d5733936d8
ffmpeg/libavutil/version.h

144 lines
4.3 KiB
C
Raw Normal View History

lavu: split version info into version.h Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-24 03:03:51 +02:00
/*
* copyright (c) 2003 Fabrice Bellard
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVUTIL_VERSION_H
#define AVUTIL_VERSION_H
lavu: Move preprocessor macros in a separate file And remove all the circular inclusions of avutil.h while at it.
2013-12-27 02:57:48 +01:00
#include "macros.h"
Create version.h headers for libraries that lack them
2012-07-01 11:51:30 +02:00
libavutil: loose idiotic circular dependancies between version and avutil.h This fixes the recently appearing PIX_FMT warnings Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-13 18:16:34 +02:00
/**
* @defgroup version_utils Library Version Macros
*
* Useful to check and match library version in order to maintain
* backward compatibility.
*
* @{
*/
#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
#define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c
#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
/**
* @}
*/
Create version.h headers for libraries that lack them
2012-07-01 11:51:30 +02:00
/**
* @file
* @ingroup lavu
* Libavutil version macros
*/
lavu: split version info into version.h Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-24 03:03:51 +02:00
/**
* @defgroup lavu_ver Version and Build diagnostics
*
* Macros and function useful to check at compiletime and at runtime
* which version of libavutil is in use.
*
* @{
*/
Revert "Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'" (Bump 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-16 23:24:52 +01:00
#define LIBAVUTIL_VERSION_MAJOR 52
lavu/rational: add syntactic sugar. Add a function to create a rational and macros for common values.
2013-12-31 14:07:25 +01:00
#define LIBAVUTIL_VERSION_MINOR 63
avutil/avstring: add av_strnlen() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-21 15:42:04 +01:00
#define LIBAVUTIL_VERSION_MICRO 100
lavu: split version info into version.h Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-24 03:03:51 +02:00
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \
LIBAVUTIL_VERSION_MICRO)
#define LIBAVUTIL_VERSION AV_VERSION(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \
LIBAVUTIL_VERSION_MICRO)
#define LIBAVUTIL_BUILD LIBAVUTIL_VERSION_INT
#define LIBAVUTIL_IDENT "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
/**
* @}
Create version.h headers for libraries that lack them
2012-07-01 11:51:30 +02:00
*
* @defgroup depr_guards Deprecation guards
Clarify Doxygen comment for FF_API_* #defines.
2012-07-03 22:42:42 +02:00
* FF_API_* defines may be placed below to indicate public API that will be
* dropped at a future version bump. The defines themselves are not part of
* the public API and may change, break or disappear at any time.
Create version.h headers for libraries that lack them
2012-07-01 11:51:30 +02:00
*
* @{
lavu: split version info into version.h Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-24 03:03:51 +02:00
*/
Create version.h headers for libraries that lack them
2012-07-01 11:51:30 +02:00
#ifndef FF_API_GET_BITS_PER_SAMPLE_FMT
Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c' * 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-16 21:36:14 +01:00
#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 54)
Create version.h headers for libraries that lack them
2012-07-01 11:51:30 +02:00
#endif
#ifndef FF_API_FIND_OPT
Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c' * 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-16 21:36:14 +01:00
#define FF_API_FIND_OPT (LIBAVUTIL_VERSION_MAJOR < 54)
Create version.h headers for libraries that lack them
2012-07-01 11:51:30 +02:00
#endif
#ifndef FF_API_OLD_AVOPTIONS
Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c' * 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-16 21:36:14 +01:00
#define FF_API_OLD_AVOPTIONS (LIBAVUTIL_VERSION_MAJOR < 54)
Create version.h headers for libraries that lack them
2012-07-01 11:51:30 +02:00
#endif
pixfmt: add AV_ prefixes to PIX_FMT_*
2012-10-06 11:18:06 +02:00
#ifndef FF_API_PIX_FMT
Bump libavutil major version to account for the LLS API/ABI changes. 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-14 22:30:25 +01:00
#define FF_API_PIX_FMT (LIBAVUTIL_VERSION_MAJOR < 54)
pixfmt: add AV_ prefixes to PIX_FMT_*
2012-10-06 11:18:06 +02:00
#endif
avutil: Add functions for allocating opaque contexts for algorithms The current API where the plain size is exposed is not of much use - in most cases it is allocated dynamically anyway. If allocated e.g. on the stack via an uint8_t array, there's no guarantee that the struct's members are aligned properly (unless the array is overallocated and the opaque pointer within it manually aligned to some unspecified alignment). Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-11 14:08:04 +02:00
#ifndef FF_API_CONTEXT_SIZE
Bump libavutil major version to account for the LLS API/ABI changes. 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-14 22:30:25 +01:00
#define FF_API_CONTEXT_SIZE (LIBAVUTIL_VERSION_MAJOR < 54)
avutil: Add functions for allocating opaque contexts for algorithms The current API where the plain size is exposed is not of much use - in most cases it is allocated dynamically anyway. If allocated e.g. on the stack via an uint8_t array, there's no guarantee that the struct's members are aligned properly (unless the array is overallocated and the opaque pointer within it manually aligned to some unspecified alignment). Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-11 14:08:04 +02:00
#endif
pixdesc: add functions for accessing pixel format descriptors. Make av_pix_fmt_descriptors table static on next major bump. Making the table public is dangerous, since the caller has no way to know how large it actually is. It also prevents adding new fields to AVPixFmtDescriptor without a major bump.
2012-10-06 12:36:38 +02:00
#ifndef FF_API_PIX_FMT_DESC
Bump libavutil major version to account for the LLS API/ABI changes. 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-14 22:30:25 +01:00
#define FF_API_PIX_FMT_DESC (LIBAVUTIL_VERSION_MAJOR < 54)
pixdesc: add functions for accessing pixel format descriptors. Make av_pix_fmt_descriptors table static on next major bump. Making the table public is dangerous, since the caller has no way to know how large it actually is. It also prevents adding new fields to AVPixFmtDescriptor without a major bump.
2012-10-06 12:36:38 +02:00
#endif
Move av_reverse table to libavcodec It is only used in that library.
2012-10-11 18:50:30 +02:00
#ifndef FF_API_AV_REVERSE
Bump libavutil major version to account for the LLS API/ABI changes. 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-14 22:30:25 +01:00
#define FF_API_AV_REVERSE (LIBAVUTIL_VERSION_MAJOR < 54)
Move av_reverse table to libavcodec It is only used in that library.
2012-10-11 18:50:30 +02:00
#endif
lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h
2012-11-10 15:03:17 +01:00
#ifndef FF_API_AUDIOCONVERT
Bump libavutil major version to account for the LLS API/ABI changes. 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-14 22:30:25 +01:00
#define FF_API_AUDIOCONVERT (LIBAVUTIL_VERSION_MAJOR < 54)
lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h
2012-11-10 15:03:17 +01:00
#endif
cpu.h: define AV_CPU_FLAG_MMX2 for libavutil major 52
2012-11-16 14:55:08 +01:00
#ifndef FF_API_CPU_FLAG_MMX2
Bump libavutil major version to account for the LLS API/ABI changes. 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-14 22:30:25 +01:00
#define FF_API_CPU_FLAG_MMX2 (LIBAVUTIL_VERSION_MAJOR < 54)
cpu.h: define AV_CPU_FLAG_MMX2 for libavutil major 52
2012-11-16 14:55:08 +01:00
#endif
lavu/samplefmt: return the size of the allocated samples buffer at the next bump Make the functions av_samples_fill_arrays, av_samples_alloc, and avcodec_fill_audio_frame return a buffer size rather than 0 in case of success. This will be enabled at the next libavutil major bump, in order to preserve backward compatibility. Returning the size allows to simplify the code, avoiding a few function calls.
2012-11-25 20:23:32 +01:00
#ifndef FF_API_SAMPLES_UTILS_RETURN_ZERO
Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c' * 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-16 21:36:14 +01:00
#define FF_API_SAMPLES_UTILS_RETURN_ZERO (LIBAVUTIL_VERSION_MAJOR < 54)
lavu/samplefmt: return the size of the allocated samples buffer at the next bump Make the functions av_samples_fill_arrays, av_samples_alloc, and avcodec_fill_audio_frame return a buffer size rather than 0 in case of success. This will be enabled at the next libavutil major bump, in order to preserve backward compatibility. Returning the size allows to simplify the code, avoiding a few function calls.
2012-11-25 20:23:32 +01:00
#endif
lls: move to the private namespace The functions are private.
2013-02-25 08:06:59 +01:00
#ifndef FF_API_LLS_PRIVATE
Bump libavutil major version to account for the LLS API/ABI changes. 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-14 22:30:25 +01:00
#define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 54)
lls: move to the private namespace The functions are private.
2013-02-25 08:06:59 +01:00
#endif
avutil: reintroduce lls1 as the 52 ABI needs it 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>
2013-11-15 23:32:51 +01:00
#ifndef FF_API_LLS1
Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c' * 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-16 21:36:14 +01:00
#define FF_API_LLS1 (LIBAVUTIL_VERSION_MAJOR < 54)
avutil: reintroduce lls1 as the 52 ABI needs it 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>
2013-11-15 23:32:51 +01:00
#endif
lavc: move AVFrame.hwaccel_picture_private to Picture. This field is private and should not be present in a public struct. It is only used in DXVA with mpegvideo-based decoders currently.
2012-10-08 07:50:14 +02:00
#ifndef FF_API_AVFRAME_LAVC
Bump libavutil major version to account for the LLS API/ABI changes. 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-14 22:30:25 +01:00
#define FF_API_AVFRAME_LAVC (LIBAVUTIL_VERSION_MAJOR < 54)
lavc: move AVFrame.hwaccel_picture_private to Picture. This field is private and should not be present in a public struct. It is only used in DXVA with mpegvideo-based decoders currently.
2012-10-08 07:50:14 +02:00
#endif
vdpau: deprecate old codec-specific pixel formats Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-07-25 21:30:18 +02:00
#ifndef FF_API_VDPAU
Bump libavutil major version to account for the LLS API/ABI changes. 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-14 22:30:25 +01:00
#define FF_API_VDPAU (LIBAVUTIL_VERSION_MAJOR < 54)
vdpau: deprecate old codec-specific pixel formats Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-07-25 21:30:18 +02:00
#endif
lavu/channel_layout: change av_get_channel_layout() behavior at the next bump 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.
2013-10-04 15:20:50 +02:00
#ifndef FF_API_GET_CHANNEL_LAYOUT_COMPAT
Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c' * 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-16 21:36:14 +01:00
#define FF_API_GET_CHANNEL_LAYOUT_COMPAT (LIBAVUTIL_VERSION_MAJOR < 54)
lavu/channel_layout: change av_get_channel_layout() behavior at the next bump 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.
2013-10-04 15:20:50 +02:00
#endif
avutil/opencl: compile kernels separately Reviewed-by: Wei Gao <highgod0401@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 04:58:09 +01:00
#ifndef FF_API_OLD_OPENCL
Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c' * 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-16 21:36:14 +01:00
#define FF_API_OLD_OPENCL (LIBAVUTIL_VERSION_MAJOR < 54)
avutil/opencl: compile kernels separately Reviewed-by: Wei Gao <highgod0401@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 04:58:09 +01:00
#endif
Deprecate obsolete XvMC hardware decoding support XvMC has long ago been superseded by newer acceleration APIs, such as VDPAU, and few downstreams still support it. Furthermore XvMC is not implemented within the hwaccel framework, but requires its own specific code in the MPEG-1/2 decoder, which is a maintenance burden.
2013-11-05 08:16:31 +01:00
#ifndef FF_API_XVMC
Bump libavutil major version to account for the LLS API/ABI changes. 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-14 22:30:25 +01:00
#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 54)
Deprecate obsolete XvMC hardware decoding support XvMC has long ago been superseded by newer acceleration APIs, such as VDPAU, and few downstreams still support it. Furthermore XvMC is not implemented within the hwaccel framework, but requires its own specific code in the MPEG-1/2 decoder, which is a maintenance burden.
2013-11-05 08:16:31 +01:00
#endif
avutil: Add deprecation ifdefs around obsolete intfloat code This long-deprecated code should disappear at the next version bump.
2013-12-13 13:34:07 +01:00
#ifndef FF_API_INTFLOAT
Bump libavutil major version to account for the LLS API/ABI changes. 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-14 22:30:25 +01:00
#define FF_API_INTFLOAT (LIBAVUTIL_VERSION_MAJOR < 54)
avutil: Add deprecation ifdefs around obsolete intfloat code This long-deprecated code should disappear at the next version bump.
2013-12-13 13:34:07 +01:00
#endif
Create version.h headers for libraries that lack them
2012-07-01 11:51:30 +02:00
/**
* @}
*/
#endif /* AVUTIL_VERSION_H */
Merge remote-tracking branch 'qatar/master' * qatar/master: (29 commits) lavfi: reclassify showfiltfmts as a TESTPROG graph2dot: fix printf format specifier swscale: yuv2planeX 8bit >=sse2 functions need aligned stack on x86-32. vp8: loopfilter >=sse2 functions need aligned stack on x86-32. amr: remove shift out of the AMR_BIT() macro. dsputilenc: group yasm and inline asm function pointer assignment. mov: use forward declaration of a function instead of a table. Clarify Doxygen comment for FF_API_* #defines. configure: simplify get_version() Create version.h headers for libraries that lack them gitignore: Use full path instead of relative path to specify patterns mpegvideo: remove VLAs Add XTEA encryption support in libavutil Add Blowfish encryption support in libavutil eval: Add the isinf() function and tests for it flacdec: move lpc filter to flacdsp flacdec: split off channel decorrelation as flacdsp avplay: Add an option for not limiting the input buffer size FATE: add a test for WMA cover art. FATE: add a test for apetag cover art ... Conflicts: .gitignore configure ffplay.c libavcodec/Makefile libavcodec/error_resilience.c libavcodec/mpegvideo.c libavcodec/ratecontrol.c libavdevice/avdevice.h libavfilter/Makefile libavfilter/filtfmts.c libavfilter/version.h libavformat/mov.c libavformat/version.h libavutil/Makefile libavutil/avutil.h libavutil/version.h libswscale/swscale.h libswscale/x86/swscale_mmx.c tests/fate/libavutil.mak tests/lavfi-regression.sh tools/graph2dot.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-04 20:39:50 +02:00
Reference in New Issue Copy Permalink