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
path: root/Makefile
AgeCommit message (Collapse)Author
2014-05-15Merge commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f'Michael Niedermayer
* commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f': build: add avresample after avcodec to FFLIBS Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-15build: add avresample after avcodec to FFLIBSJanne Grunau
avcodec might depend on avresample and with --as-needed required symbols might be get removed if avresample is linked before avcodec. Fixes link failures of avprobe and avplay on aarch64 with --enable-neon-clobber-test.
2014-05-12Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'Michael Niedermayer
* commit '1839fafa951308237c4672ffd9a94f927b26eac7': avconv: Support VDA hwaccel Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11avconv: Support VDA hwaccelAnton Khirnov
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-04-29Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a'Michael Niedermayer
* commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a': configure: rework dxva in avconv handling Conflicts: Makefile configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'Michael Niedermayer
* commit '35177ba77ff60a8b8839783f57e44bcc4214507a': avconv: add support for DXVA2 decoding Conflicts: Makefile configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29configure: rework dxva in avconv handlingAnton Khirnov
Move the dxva check after the dependencies have been detected, make sure the ole32 library exists. Fixes build on non-Windows.
2014-04-28avconv: add support for DXVA2 decodingHendrik Leppkes
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-04-07Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'Michael Niedermayer
* commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14': aarch64: add armv8 CPU flag Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-06aarch64: add armv8 CPU flagJanne Grunau
2014-04-01Makefile: fix out of tree builds of .m filesMichael Niedermayer
should fix fate failures on darwin Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143'Michael Niedermayer
* commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143': Remove all SPARC architecture optimizations Conflicts: Makefile configure libavcodec/sparc/dsputil_vis.c libavcodec/sparc/dsputil_vis.h libavcodec/sparc/hpeldsp_vis.c libavcodec/sparc/simple_idct_vis.c libavcodec/sparc/vis.h libswscale/sparc/yuv2rgb_vis.c libswscale/swscale_internal.h If someone wants to maintain these (or other) SPARC optimizations, please contact me or ffmpeg-devel. I am happy to revert this removial if theres someone considering to maintain this code. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-13Remove all SPARC architecture optimizationsDiego Biurrun
SPARC is no longer being used in any multimedia-related fields and the VIS optimizations only represent a maintenance burden.
2014-02-11tools: add uncoded_frame test program.Nicolas George
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-06Add Windows resource file support for shared librariesJames Almer
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>
2013-12-03Makefile: add dependancies for ffversion.hMichael Niedermayer
It has to be build before the objects that use it Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-02build: Add rule for building host-specific object filesDiego Biurrun
2013-12-02build: Add shorthand for HOSTCC compile macroDiego Biurrun
2013-12-01Makefile: remove version.h on distcleanMichael Niedermayer
Without this nothing will remove it even if it isnt generated in newer versions anymore. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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-27Merge commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c'Michael Niedermayer
* commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c': Makefile: Fix building programs on systems with a nonempty executable suffix Conflicts: Makefile See: f1db007e008d3ece791c7ac65c537d1d301ea0cc Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-27Makefile: Fix building programs on systems with a nonempty executable suffixMartin Storsjö
This fixes leftover issues from 14abeaa4 which caused make rules for programs to not match up properly when the executable suffix was nonempty. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-11-26Makefile: Fix building progs out of progs_gMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-26Merge commit 'ab81f24ad43bddf77ddd25cba86780c1c884996c'Michael Niedermayer
* commit 'ab81f24ad43bddf77ddd25cba86780c1c884996c': build: Integrate multilibrary examples into the build system Conflicts: configure doc/Makefile doc/examples/muxing.c doc/examples/output.c libavformat/Makefile libavformat/output-example.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-26Merge commit '14abeaa43d021afdce9119d906891abe89c03b88'Michael Niedermayer
* commit '14abeaa43d021afdce9119d906891abe89c03b88': build: Separate building programs linking against libav* from building av* Conflicts: Makefile doc/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-25build: Integrate multilibrary examples into the build systemDiego Biurrun
This includes moving libavformat/output-example to doc/examples/output.
2013-11-25build: Separate building programs linking against libav* from building av*Diego Biurrun
This will allow cleaner integration of building example programs.
2013-11-23Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'Michael Niedermayer
* commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea': avconv: add support for VDPAU decoding Conflicts: Changelog Makefile configure ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-23avconv: add support for VDPAU decodingAnton Khirnov
2013-11-04Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: build: Remove redundant OBJS declaration intended for programs Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03build: Remove redundant OBJS declaration intended for programsDiego Biurrun
2013-10-31build: Ensure that strip commands are run silentlyDiego Biurrun
2013-05-24Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'Michael Niedermayer
* commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d': w32pthreads: move from lavc to compat/ Conflicts: libavcodec/Makefile libavcodec/pthread.c libavcodec/vp8.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24w32pthreads: move from lavc to compat/Anton Khirnov
It will be used in other places than lavc.
2013-05-19build: drop unused ALLMANPAGES variableStefano Sabatini
2013-04-06Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640'Michael Niedermayer
* commit 'a862c7d3368241e72a465ab944afa38ea62a6640': Integrate lcov/gcov into Libav Conflicts: Makefile common.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05Integrate lcov/gcov into LibavReinhard Tartler
The gcov/lcov are a common toolchain for visualizing code coverage with the GNU/Toolchain. The documentation and implementation of this integration was heavily inspired from the blog entry by Mike Melanson: http://multimedia.cx/eggs/using-lcov-with-ffmpeg/
2013-03-28Merge commit 'b4d24b471bc52f1f78a43ee330199e70483e51c3'Michael Niedermayer
* commit 'b4d24b471bc52f1f78a43ee330199e70483e51c3': build: Remove configure-generated .config file on distclean msmpeg4: Split decoding related functions to a separate file Conflicts: Makefile libavcodec/Makefile libavcodec/msmpeg4.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-27build: Remove configure-generated .config file on distcleanDiego Biurrun
2013-03-26tools: add tiny_ssimLoren Merritt
Taken from: http://lists.mplayerhq.hu/pipermail/mencoder-users/2006-August/003801.html and x264 See: [FFmpeg-devel] [PATCH] tools: add tiny_ssim Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-23build: Add proper infrastructure for adding and checking host CPPFLAGSDiego Biurrun
2012-12-11Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: build: fix 'clean' target ZeroCodec: Flip output Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-10build: fix 'clean' targetMans Rullgard
This fixes removal of TOOLS as well as HOSTPROGS declared in the top-level Makefile. The clean target in common.mak needs to be eval'd since the variables used within are reset for each library. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-12-08Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'Michael Niedermayer
* commit 'b326755989b346d0d935e0628e8865f9b2951c30': arm: rename ARMVFP config symbol to VFP Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-07arm: rename ARMVFP config symbol to VFPMans Rullgard
This is consistent with usual ARM nomenclature as well as with the VFPV3 and NEON symbols which both lack the ARM prefix. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-11-23Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da'Michael Niedermayer
* commit '4a606c830ae664013cea33800094d4d0f4ec62da': av_memcpy_backptr: optimise some special cases mpegvideo: simplify dxy calculation in hpel_motion() build: add rules to generate preprocessed source files Conflicts: Makefile libavutil/mem.c library.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-23build: add rules to generate preprocessed source filesMans Rullgard
This is useful for debugging. Dependencies for these files are not generated due to limitations in many compilers. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-31x86: yasm: Use complete source path for macro helper %includesDiego Biurrun
This is more consistent with the way we handle C #includes and it simplifies the build system.
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-19 18:42:25 +0300