summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* ffserver: move configuration code to separate fileLukasz Marek2014-10-221-0/+1
| | | | | | | | This commit doesn't change any existing logic. It moves ffserver configuration related code to separate file. It intends to make maintaining easier. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* Merge commit 'd45ebd4876ab8fc07736a644de07e1b1d11a8e5d'Michael Niedermayer2014-07-221-0/+1
|\ | | | | | | | | | | | | | | | | | | * commit 'd45ebd4876ab8fc07736a644de07e1b1d11a8e5d': configure: add support for neon intrinsics Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: add support for neon intrinsicsJanne Grunau2014-07-211-0/+1
| |
* | Merge commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830'Michael Niedermayer2014-07-221-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830': build: Support executable only ldflags Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Support executable only ldflagsLuca Barbato2014-07-211-2/+2
| | | | | | | | | | The options is useful to build position-independent executables on hardened systems (e.g. Android L and Gentoo Hardened).
| * Remove avserver.Anton Khirnov2014-06-181-2/+1
| | | | | | | | | | | | | | It has not been properly maintained for years and there is little hope of that changing in the future. It appears simpler to write a new replacement from scratch than unbreaking it.
* | Merge commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f'Michael Niedermayer2014-05-151-7/+8
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f': build: add avresample after avcodec to FFLIBS Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: add avresample after avcodec to FFLIBSJanne Grunau2014-05-151-5/+6
| | | | | | | | | | | | | | 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.
* | Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'Michael Niedermayer2014-05-121-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '1839fafa951308237c4672ffd9a94f927b26eac7': avconv: Support VDA hwaccel Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: Support VDA hwaccelAnton Khirnov2014-05-111-0/+1
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a'Michael Niedermayer2014-04-291-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a': configure: rework dxva in avconv handling Conflicts: Makefile configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: rework dxva in avconv handlingAnton Khirnov2014-04-281-1/+1
| | | | | | | | | | | | | | Move the dxva check after the dependencies have been detected, make sure the ole32 library exists. Fixes build on non-Windows.
* | Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'Michael Niedermayer2014-04-291-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '35177ba77ff60a8b8839783f57e44bcc4214507a': avconv: add support for DXVA2 decoding Conflicts: Makefile configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: add support for DXVA2 decodingHendrik Leppkes2014-04-281-0/+1
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'Michael Niedermayer2014-04-071-1/+1
|\ \ | |/ | | | | | | | | | | * commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14': aarch64: add armv8 CPU flag Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aarch64: add armv8 CPU flagJanne Grunau2014-04-061-1/+1
| |
* | Makefile: fix out of tree builds of .m filesMichael Niedermayer2014-04-011-0/+1
| | | | | | | | | | | | should fix fate failures on darwin Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143'Michael Niedermayer2014-03-131-2/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Remove all SPARC architecture optimizationsDiego Biurrun2014-03-131-2/+1
| | | | | | | | | | SPARC is no longer being used in any multimedia-related fields and the VIS optimizations only represent a maintenance burden.
| * build: Add rule for building host-specific object filesDiego Biurrun2013-12-021-0/+3
| |
| * build: Add shorthand for HOSTCC compile macroDiego Biurrun2013-12-021-0/+1
| |
* | tools: add uncoded_frame test program.Nicolas George2014-02-111-1/+3
| |
* | cmdutils & opencl: add -opencl_bench option to test and show available ↵Lenny Wang2013-12-091-0/+1
| | | | | | | | | | | | | | | | OpenCL devices Reviewed-by: Wei Gao <highgod0401@gmail.com> Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add Windows resource file support for shared librariesJames Almer2013-12-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Makefile: add dependancies for ffversion.hMichael Niedermayer2013-12-031-0/+2
| | | | | | | | | | | | It has to be build before the objects that use it Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Makefile: remove version.h on distcleanMichael Niedermayer2013-11-301-1/+1
| | | | | | | | | | | | | | Without this nothing will remove it even if it isnt generated in newer versions anymore. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | build: rename version.h to libavutil/ffversion.hTimothy Gu2013-11-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c'Michael Niedermayer2013-11-271-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c': Makefile: Fix building programs on systems with a nonempty executable suffix Conflicts: Makefile See: f1db007e008d3ece791c7ac65c537d1d301ea0cc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Makefile: Fix building programs on systems with a nonempty executable suffixMartin Storsjö2013-11-261-2/+2
| | | | | | | | | | | | | | | | 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>
* | Makefile: Fix building progs out of progs_gMichael Niedermayer2013-11-261-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ab81f24ad43bddf77ddd25cba86780c1c884996c'Michael Niedermayer2013-11-261-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * build: Integrate multilibrary examples into the build systemDiego Biurrun2013-11-251-1/+2
| | | | | | | | This includes moving libavformat/output-example to doc/examples/output.
* | Merge commit '14abeaa43d021afdce9119d906891abe89c03b88'Michael Niedermayer2013-11-261-19/+21
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '14abeaa43d021afdce9119d906891abe89c03b88': build: Separate building programs linking against libav* from building av* Conflicts: Makefile doc/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Separate building programs linking against libav* from building av*Diego Biurrun2013-11-251-18/+20
| | | | | | | | This will allow cleaner integration of building example programs.
* | Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'Michael Niedermayer2013-11-231-1/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea': avconv: add support for VDPAU decoding Conflicts: Changelog Makefile configure ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: add support for VDPAU decodingAnton Khirnov2013-11-231-1/+4
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-041-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | * qatar/master: build: Remove redundant OBJS declaration intended for programs Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Remove redundant OBJS declaration intended for programsDiego Biurrun2013-11-031-1/+0
| |
| * build: Ensure that strip commands are run silentlyDiego Biurrun2013-10-311-1/+1
| |
* | Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'Michael Niedermayer2013-05-241-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d': w32pthreads: move from lavc to compat/ Conflicts: libavcodec/Makefile libavcodec/pthread.c libavcodec/vp8.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * w32pthreads: move from lavc to compat/Anton Khirnov2013-05-241-1/+1
| | | | | | | | It will be used in other places than lavc.
* | build: drop unused ALLMANPAGES variableStefano Sabatini2013-05-191-1/+0
| |
* | Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640'Michael Niedermayer2013-04-061-10/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'a862c7d3368241e72a465ab944afa38ea62a6640': Integrate lcov/gcov into Libav Conflicts: Makefile common.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Integrate lcov/gcov into LibavReinhard Tartler2013-04-051-0/+1
| | | | | | | | | | | | | | 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/
* | Merge commit 'b4d24b471bc52f1f78a43ee330199e70483e51c3'Michael Niedermayer2013-03-281-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * 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>
| * build: Remove configure-generated .config file on distcleanDiego Biurrun2013-03-271-1/+1
| |
| * build: Add proper infrastructure for adding and checking host CPPFLAGSDiego Biurrun2013-02-231-1/+1
| |
* | tools: add tiny_ssimLoren Merritt2013-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-111-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * qatar/master: build: fix 'clean' target ZeroCodec: Flip output Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: fix 'clean' targetMans Rullgard2012-12-101-1/+0
| | | | | | | | | | | | | | | | 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>
View Lorry Controller Status