summaryrefslogtreecommitdiff
path: root/libavutil
Commit message (Collapse)AuthorAge
* Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'Michael Niedermayer2012-10-23
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8b8899ac3233b4f7af83ded0dc032fad8902d714': fate: Declare avcodec/avformat deps in the respective Makefile snippets fate: Add dependencies for WMA and WavPack tests Improve wording and spelling of av_log_missing_feature messages. lavu: remove disabled FF_API_AV_FIFO_PEEK cruft Conflicts: libavcodec/aacsbr.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: remove disabled FF_API_AV_FIFO_PEEK cruftAnton Khirnov2012-10-23
| |
* | Merge commit 'c692957c4edd119920cd7f2121628dd183589e6a'Michael Niedermayer2012-10-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c692957c4edd119920cd7f2121628dd183589e6a': lavu: remove disabled avoptions cruft lavu: remove disabled FF_API_GET_BITS_PER_SAMPLE_FMT cruft Conflicts: libavutil/opt.c libavutil/opt.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: remove disabled avoptions cruftAnton Khirnov2012-10-23
| |
| * lavu: remove disabled FF_API_GET_BITS_PER_SAMPLE_FMT cruftAnton Khirnov2012-10-23
| |
* | Merge commit '468ea9d5b14f92fe61f47f034e67066f65163f5f'Michael Niedermayer2012-10-23
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '468ea9d5b14f92fe61f47f034e67066f65163f5f': Revert "avutil: make some tables visible again" Revert "avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility" Conflicts: libavcodec/sqrt_tab.c libavutil/libavutil.v Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Revert "avutil: make some tables visible again"Anton Khirnov2012-10-23
| | | | | | | | | | | | This reverts commit def8c94699877d015154a03d43e2b8f479cd89a0. After the major bump this is no longer necessary.
| * Revert "avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI ↵Anton Khirnov2012-10-23
| | | | | | | | | | | | | | | | compatibility" This reverts commit d15c21e5fa3961f10026da1a3080a3aa3cf4cec9. After the major bump this is no longer necessary.
* | Merge commit 'add3a6902ea4d459f36655656a1f8daa409118a7'Michael Niedermayer2012-10-23
|\| | | | | | | | | | | | | | | | | | | * commit 'add3a6902ea4d459f36655656a1f8daa409118a7': lavu: bump major to 52 Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: bump major to 52Anton Khirnov2012-10-23
| | | | | | | | | | | | In addition to the recent tables mess, the AVOption defaults behavior changed, so an old lavc used with a new lavu will get completely messed up defaults.
* | Merge commit '2b8dd371e4d276ca0d342e82b8b4cc281be0630a'Michael Niedermayer2012-10-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2b8dd371e4d276ca0d342e82b8b4cc281be0630a': lavu: postpone recent deprecations until the next major bump APIchanges: update lavr bump date avconv: only apply presets when we have an encoder. atrac3: replace a calculation with FFALIGN() atrac3: remove unused ATRAC3Context field, sample_rate atrac3: use sizeof(variable) instead of sizeof(type) atrac3: simplify MDCT window calculation Conflicts: doc/APIchanges Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: postpone recent deprecations until the next major bumpAnton Khirnov2012-10-23
| |
* | Merge commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4'Michael Niedermayer2012-10-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4': rtpdec: Don't pass a non-AVClass pointer as log context rtsp: Update a comment to the current filename scheme avcodec: handle AVERROR_EXPERIMENTAL avutil: Add AVERROR_EXPERIMENTAL avcodec: prefer decoders without CODEC_CAP_EXPERIMENTAL Conflicts: doc/APIchanges ffmpeg.c libavcodec/utils.c libavformat/rtpdec.c libavutil/error.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avutil: Add AVERROR_EXPERIMENTALNathan Caldwell2012-10-21
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | lavu/parseutils: remove unused gcd variable in av_parse_ratio()Stefano Sabatini2012-10-22
| | | | | | | | Fix warning.
* | Merge commit '2d09b36c0379fcda8f984bc8ad8816c8326fd7bd'Michael Niedermayer2012-10-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2d09b36c0379fcda8f984bc8ad8816c8326fd7bd': doc/platform: Add info on shared builds with MSVC doc/platform: Move a caveat down to the notes section ARM: reinstate optimised intmath.h ffv1: update to ffv1 version 3 Conflicts: doc/platform.texi libavcodec/ffv1.c libavcodec/ffv1.h libavcodec/ffv1dec.c libavcodec/ffv1enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ARM: reinstate optimised intmath.hMans Rullgard2012-10-20
| | | | | | | | | | | | Use of the ARM optimised intmath.h was accidentally dropped in 9734b8b. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9'Michael Niedermayer2012-10-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9': avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility avutil: make some tables visible again avutil: remove inline av_log2 from public API celp_math: rename ff_log2 to ff_log2_q15 Conflicts: libavutil/libavutil.v Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibilityMartin Storsjö2012-10-20
| | | | | | | | | | | | | | | | | | | | | | | | Earlier versions of for instance of libavcodec expect this symbol to be present in libavutil. This commit can be reverted after the next major bump. New shared builds of avcodec will link to the internal copy of the table within that library, so those builds won't rely on this table being present in avutil any longer either. Signed-off-by: Martin Storsjö <martin@martin.st>
| * avutil: make some tables visible againReinhard Tartler2012-10-20
| | | | | | | | | | | | | | These tables are used for instance by older versions of libavcodec and need to remain visible until the next SONAME bump. Signed-off-by: Martin Storsjö <martin@martin.st>
| * avutil: remove inline av_log2 from public APIMans Rullgard2012-10-20
| | | | | | | | | | | | | | | | This removes inline av_log2 and av_log2_16bit from the public API, instead exporting them as regular functions. In-tree code still gets the inline and otherwise optimised variants. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: configure: Group math functions into a separate variable avutil/mem: K&R formatting cosmetics avutil/lzo: K&R formatting cosmetics Conflicts: configure libavutil/mem.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avutil/mem: K&R formatting cosmeticsDiego Biurrun2012-10-20
| |
| * avutil/lzo: K&R formatting cosmeticsDiego Biurrun2012-10-20
| |
* | Merge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed'Michael Niedermayer2012-10-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed': fate-vc1: add dependencies ARM: fix overreads in neon h264 chroma mc rtsp: Make sure the ret variable is initialized in ff_rtsp_fetch_packet gitignore: ignore files created by msvc fate: Add proper dependencies for the tests in video.mak configure: Disable Snow decoder and encoder by default lzo: Drop obsolete fast_memcpy reference build: Drop OBJS declaration for non-existing PCM_DVD encoder mpeg4videodec: Disable frame multithreading for GMC, its not implemented at all Conflicts: libavcodec/mpegvideo.c libavformat/rtsp.c tests/fate/microsoft.mak tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lzo: Drop obsolete fast_memcpy referenceDiego Biurrun2012-10-19
| |
* | lavu/parseutils: rework rational reduction logic in av_parse_ratio()Stefano Sabatini2012-10-20
| | | | | | | | | | | | | | | | | | Avoid to divide num and den by gcd in case of a parsed expression, since that is already done in av_d2q(), and force reduction in case of "a:b" form, allowing to honour the max parameter. The latter change is consistent with the a/b case, and with the documentation.
* | Mark data symbols shared between libraries with av_exportHendrik Leppkes2012-10-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72'Michael Niedermayer2012-10-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72': fate: add a dependency helper macro Add support for building shared libraries with MSVC avcodec: Rename avpriv_frame_rate_tab to ff_mpeg12_frame_rate_tab gxf: Add a local copy of the relevant parts of the frame rate table configure: Split out msvc as a separate target OS aviobuf: Remove a senseless ifdef in avio_seek Conflicts: configure libavcodec/dirac.c libavcodec/mpeg12data.h libavcodec/mpeg12enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add support for building shared libraries with MSVCMartin Storsjö2012-10-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This requires the makedef perl script by Derek, from the c89-to-c99 repo. That scripts produces a .def file, listing the symbols to be exported, based on the gcc version scripts and the built object files. To properly load non-function symbols from DLL files, the data symbol declarations need to have the attribute __declspec(dllimport) when building the calling code. (On mingw, the linker can fix this up automatically, which is why it has not been an issue so far. If this attribute is omitted, linking actually succeeds, but reads from the table will not produce the desired results at runtime.) MSVC seems to manage to link DLLs (and run properly) even if this attribute is present while building the library itself (which normally isn't recommended) - other object files in the same library manage to link to the symbol (with a small warning at link time, like "warning LNK4049: locally defined symbol _avpriv_mpa_bitrate_tab imported" - it doesn't seem to be possible to squelch this warning), and the definition of the tables themselves produce a warning that can be squelched ("warning C4273: 'avpriv_mpa_bitrate_tab' : inconsistent dll linkage, see previous definition of 'avpriv_mpa_bitrate_tab'). In this setup, mingw isn't able to link object files that refer to data symbols with __declspec(dllimport) without those symbols actually being linked via a DLL (linking avcodec.dll ends up with errors like "undefined reference to `__imp__avpriv_mpa_freq_tab'"). The dllimport declspec isn't needed at all in mingw, so we simply choose not to declare it for other compilers than MSVC that requires it. (If ICL support later requires it, the condition can be extended later to include both of them.) This also implies that code that is built to link to a certain library as a DLL can't link to the same library as a static library. Therefore, we only allow building either static or shared but not both at the same time. (That is, static libraries as such can be, and actually are, built - this is used for linking the test tools to internal symbols in the libraries - but e.g. libavformat built to link to libavcodec as a DLL cannot link statically to libavcodec.) Also, linking to DLLs is slightly different from linking to shared libraries on other platforms. DLLs use a thing called import libraries, which is basically a stub library allowing the linker to know which symbols exist in the DLL and what name the DLL will have at runtime. In mingw/gcc, the import library is usually named libfoo.dll.a, which goes next to a static library named libfoo.a. This allows gcc to pick the dynamic one, if available, from the normal -lfoo switches, just as it does for libfoo.a vs libfoo.so on Unix. On MSVC however, you need to literally specify the name of the import library instead of the static library. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d'Michael Niedermayer2012-10-16
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d': rangecoder-test: Return in case of an error build: simplify enabling of compat objects Conflicts: configure libavutil/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: simplify enabling of compat objectsMans Rullgard2012-10-15
| | | | | | | | | | | | | | | | Add a configure function to pull in a compat object and set up redirects in one operation. This avoids duplicating conditions across configure and makefiles. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avutil: Do not make ff_ symbols globally visible. avutil: Rename ff_set_systematic_pal2() ---> avpriv_set_systematic_pal2() build: tms470: work around glibc math.h problems configure: improve tms470 compiler usage with glibc Conflicts: libavcodec/bmpenc.c libavcodec/rawdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avutil: Do not make ff_ symbols globally visible.Diego Biurrun2012-10-13
| |
| * avutil: Rename ff_set_systematic_pal2() ---> avpriv_set_systematic_pal2()Diego Biurrun2012-10-13
| | | | | | | | Functions used across libraries should have avpriv_ and not ff_ prefixes.
* | Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520'Michael Niedermayer2012-10-14
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520': configure: tms470: add mapping for -mfpu=vfpv3-d16 flag configure: recognise Minix as OS configure: work around bug in ash shell eval-test: make table static const lavr: handle clipping in the float to s32 conversion nut: support pcm codecs not mapped in avi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * eval-test: make table static constMans Rullgard2012-10-13
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | avoid more "0xFF << 24" as it is considered a integer overflow in C99Michael Niedermayer2012-10-14
| | | | | | | | | | | | missed these in my previous search and replace Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavutil: loose idiotic circular dependancies between version and avutil.hMichael Niedermayer2012-10-13
| | | | | | | | | | | | This fixes the recently appearing PIX_FMT warnings Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609'Michael Niedermayer2012-10-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609': avplay: use audio parameters from the decoded frame instead of AVCodecContext dca: allocate a secondary buffer for extra channels when downmixing configure: use utilities from /usr/xpg4/bin if it exists avstring-test: fix memory leaks Conflicts: ffplay.c libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avstring-test: fix memory leaksMans Rullgard2012-10-12
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge commit 'd5c62122a7b26704bf867a1262df358623bf5edf'Michael Niedermayer2012-10-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd5c62122a7b26704bf867a1262df358623bf5edf': Move av_reverse table to libavcodec Conflicts: libavcodec/asvenc.c libavcodec/vble.c libavutil/common.h libavutil/mathematics.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Move av_reverse table to libavcodecDiego Biurrun2012-10-12
| | | | | | | | It is only used in that library.
* | Merge commit '930c9d4373e0f3cb7c64fcfc129127a309f6d066'Michael Niedermayer2012-10-13
|\| | | | | | | | | | | | | * commit '930c9d4373e0f3cb7c64fcfc129127a309f6d066': avutil: Duplicate ff_log2_tab instead of sharing it across libs Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avutil: Duplicate ff_log2_tab instead of sharing it across libsDiego Biurrun2012-10-12
| | | | | | | | | | The table is so small that the space gain is not worth the performance overhead of cross-library access.
* | Merge commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507'Michael Niedermayer2012-10-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507': avfilter: call x86 init functions under if (ARCH_X86), not if (HAVE_MMX) rtspdec: Set the default port for listen mode, if none is specified tscc2: Fix an out of array access rtmpproto: Fix an out of array write rtspdec: Fix use of uninitialized byte vp8: reset loopfilter delta values at keyframes. avutil: add yuva422p and yuva444p formats Conflicts: libavutil/pixdesc.c libavutil/pixfmt.h tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avutil: add yuva422p and yuva444p formatsLuca Barbato2012-10-12
| |
* | imgutils: do not use av_pix_fmt_descriptors directlyPaul B Mahol2012-10-12
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-12
|\| | | | | | | | | | | | | | | | | | | * qatar/master: lavu,lavd: do not use av_pix_fmt_descriptors directly. Conflicts: libavutil/imgutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu,lavd: do not use av_pix_fmt_descriptors directly.Anton Khirnov2012-10-12
| |