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
2012-10-30tree: fix type used for testing the treeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-29lavu/parseutils: add trailing characters check in av_parse_video_size()Stefano Sabatini
Return an error in case the video size specifications contains spurious trailing chars, like in "320x240foobar".
2012-10-28lavu: keep context size variablesMichael Niedermayer
They are essential to be able to use the utils without av_malloc() That is for example use with malloc(), memalign(), some other private allocation function, on the stack or others. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-27lavu: add more doxy to av_rescale_deltaMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-27lavu: add av_rescale_delta()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-27mathemathics: update copyright yearsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-27lavu: add av_clip64()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-26Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: configure: sanitise sparc vis check configure: recognise more sparc variants as --cpu argument build: Include HEADERS-yes in the HEADERS variable pcm: change references to raw to pcm ffv1: set the range coder state in decode_slice_header pcmdec: change default of channels parameter to 1 Conflicts: libavformat/pcmdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-26tools: add ffescape utilityStefano Sabatini
2012-10-25Restore installation of libavutil/lzo.h after ↵Alexis Ballier
2a91ada8282f18d2807abee5188225bba1b19bda Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-25Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: avutil: Make LZO decoder code configure-time selectable avutil: Move memcpy_backptr() to mem.c configure: detect parisc64 automatically configure: detect ppc64 automatically configure: detect mips64 automatically configure: generalise 64-bit test smoothstreamingenc: Don't assume streams start from timestamp 0 Conflicts: configure libavutil/Makefile libavutil/lzo.c libavutil/lzo.h libavutil/mem.c libavutil/mem.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-25avutil: Make LZO decoder code configure-time selectableDiego Biurrun
2012-10-25avutil: Move memcpy_backptr() to mem.cDiego Biurrun
The function is used elsewhere and does not belong with the LZO code.
2012-10-24Merge commit 'd82f188504410fdfa446c5682c128c31bb5851a4'Michael Niedermayer
* commit 'd82f188504410fdfa446c5682c128c31bb5851a4': Remove need for padding in av_memcpy_backptr() Conflicts: libavutil/lzo.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-24Merge commit 'ceb754d041f5f6327fd9195a5f43575af9516daa'Michael Niedermayer
* commit 'ceb754d041f5f6327fd9195a5f43575af9516daa': lzo: Use AV_COPY*U macros where appropriate prepare 9_beta2 release dsputil: Replace AV_WNxx(AV_RNxx()) combinations by AV_COPYxxU intreadwrite: Add AV_COPYxxU macros for copying to/from unaligned addresses dxtory: Replace AV_WN16A(AV_RN16A()) combination by AV_COPY16 mp3: properly forward mp_decode_frame errors Conflicts: RELEASE libavcodec/mpegaudiodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-24Merge commit '80521c1997a23e148edf89e11b939ab8646297ca'Michael Niedermayer
* commit '80521c1997a23e148edf89e11b939ab8646297ca': build: allow targets to specify extra objects to link with executables swscale: avoid pointless use of compound literals libm: add fallbacks for various single-precision functions network: use getservbyport() only if available network: add fallbacks for INADDR_LOOPBACK and INET_ADDRSTRLEN Include sys/time.h before sys/resource.h Conflicts: Makefile configure libavutil/libm.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-23Remove need for padding in av_memcpy_backptr()Mans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-23lzo: Use AV_COPY*U macros where appropriateDiego Biurrun
2012-10-23intreadwrite: Add AV_COPYxxU macros for copying to/from unaligned addressesDiego Biurrun
2012-10-23Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'Michael Niedermayer
* 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>
2012-10-23Merge commit 'c692957c4edd119920cd7f2121628dd183589e6a'Michael Niedermayer
* 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>
2012-10-23Merge commit '468ea9d5b14f92fe61f47f034e67066f65163f5f'Michael Niedermayer
* 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>
2012-10-23Merge commit 'add3a6902ea4d459f36655656a1f8daa409118a7'Michael Niedermayer
* commit 'add3a6902ea4d459f36655656a1f8daa409118a7': lavu: bump major to 52 Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-23Merge commit '2b8dd371e4d276ca0d342e82b8b4cc281be0630a'Michael Niedermayer
* 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>
2012-10-23libm: add fallbacks for various single-precision functionsMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-23lavu: remove disabled avoptions cruftAnton Khirnov
2012-10-23Revert "avutil: make some tables visible again"Anton Khirnov
This reverts commit def8c94699877d015154a03d43e2b8f479cd89a0. After the major bump this is no longer necessary.
2012-10-23lavu: bump major to 52Anton Khirnov
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.
2012-10-23lavu: postpone recent deprecations until the next major bumpAnton Khirnov
2012-10-23lavu: remove disabled FF_API_AV_FIFO_PEEK cruftAnton Khirnov
2012-10-23lavu: remove disabled FF_API_GET_BITS_PER_SAMPLE_FMT cruftAnton Khirnov
2012-10-23Revert "avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI ↵Anton Khirnov
compatibility" This reverts commit d15c21e5fa3961f10026da1a3080a3aa3cf4cec9. After the major bump this is no longer necessary.
2012-10-22Merge commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4'Michael Niedermayer
* 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>
2012-10-22lavu/parseutils: remove unused gcd variable in av_parse_ratio()Stefano Sabatini
Fix warning.
2012-10-22avutil: Add AVERROR_EXPERIMENTALNathan Caldwell
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-10-21Merge commit '2d09b36c0379fcda8f984bc8ad8816c8326fd7bd'Michael Niedermayer
* 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>
2012-10-21Merge commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9'Michael Niedermayer
* 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>
2012-10-20ARM: reinstate optimised intmath.hMans Rullgard
Use of the ARM optimised intmath.h was accidentally dropped in 9734b8b. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-20avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibilityMartin Storsjö
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>
2012-10-20avutil: make some tables visible againReinhard Tartler
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>
2012-10-20avutil: remove inline av_log2 from public APIMans Rullgard
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>
2012-10-20Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2012-10-20Merge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed'Michael Niedermayer
* 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>
2012-10-20lavu/parseutils: rework rational reduction logic in av_parse_ratio()Stefano Sabatini
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.
2012-10-20avutil/mem: K&R formatting cosmeticsDiego Biurrun
2012-10-20avutil/lzo: K&R formatting cosmeticsDiego Biurrun
2012-10-20Mark data symbols shared between libraries with av_exportHendrik Leppkes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-19lzo: Drop obsolete fast_memcpy referenceDiego Biurrun
2012-10-19Merge commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72'Michael Niedermayer
* 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>
2012-10-18Add support for building shared libraries with MSVCMartin Storsjö
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>