summaryrefslogtreecommitdiffstats
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* Makefile: Clean compat/atomics/pthread subdirectory.Carl Eugen Hoyos2017-03-011-0/+1
|
* Makefile: Clean compat subdirectory.Carl Eugen Hoyos2017-03-011-0/+2
| | | | Fixes ticket #5546.
* Merge commit '6641819feedb086ebba3d2be89b8d33980f367e1'Hendrik Leppkes2016-06-261-1/+1
|\ | | | | | | | | | | | | * commit '6641819feedb086ebba3d2be89b8d33980f367e1': build: Ignore generated mapfile and remove it on distclean Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * build: Ignore generated mapfile and remove it on distcleanDiego Biurrun2016-05-271-1/+1
| |
* | ffmpeg: Add cuvid hwaccel supportTimo Rothenpieler2016-06-101-0/+1
| |
* | Merge commit '06edef3d5e072ef3c4face9ce946d2d9c36cc477'Derek Buitenhuis2016-05-121-1/+1
|\ \ | |/ | | | | | | | | | | * commit '06edef3d5e072ef3c4face9ce946d2d9c36cc477': Generate the lists of enabled protocols/bsfs from configure. Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * Generate the lists of enabled protocols/bsfs from configure.Anton Khirnov2016-04-191-1/+2
| |
* | Merge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec'Derek Buitenhuis2016-05-091-6/+7
|\ \ | |/ | | | | | | | | | | * commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec': build: miscellaneous cosmetics Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * build: miscellaneous cosmeticsDiego Biurrun2016-04-071-4/+5
| | | | | | | | | | | | Restore alphabetical order in lists, break overly long lines, do some prettyprinting, add some explanatory section comments, group parts together that belong together logically.
* | Merge commit '5d273d3efac340ef8de445c955ff44c7abed4e8f'Derek Buitenhuis2016-05-081-0/+1
|\ \ | |/ | | | | | | | | | | * commit '5d273d3efac340ef8de445c955ff44c7abed4e8f': avconv: VAAPI hwcontext initialisation and hwaccel helper Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * avconv: VAAPI hwcontext initialisation and hwaccel helperMark Thompson2016-03-301-0/+1
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * configure: ObjC supportLuca Barbato2015-11-261-0/+7
| | | | | | | | | | | | | | Assume that the default C compiler and the default ObjC compiler match (default for OSX). Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | fate: add audiomatchMichael Niedermayer2016-03-221-1/+1
| | | | | | | | | | Testset provided by Justin Greer <justin@zencoder.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | build: use intermediate lcov coverage fileAndreas Cadhalpun2016-02-061-1/+1
| | | | | | | | | | | | | | Otherwise the 'lcov -q --remove' run fails with the following error: lcov: ERROR: cannot write to coverage.info! Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | configure: fall back to using full path if src is a directoryAndreas Cadhalpun2016-02-061-1/+4
| | | | | | | | | | | | | | Or when building in-tree. Also don't try to remove src on distclean in these cases. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | build: use a link instead of changing current directory when compilingAndreas Cadhalpun2016-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | If links don't work, fall back to using the full source path as was previously done. This should fix build failures with MSVC. Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | build: make out-of-tree builds bit-identical to in-tree buildsAndreas Cadhalpun2016-01-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the full source path was embedded inconsistently in the debug information between in-tree/out-of-tree builds. The 'vpath %.inc' becomes necessary for finding libavfilter/all_channel_layouts.inc in out-of-tree builds. The full source path is still embedded in the debug information, but it's now independent of whether building in-tree or out-of-tree. The biggest improvement of this patch is that gdb now always searches for the path relative to the source directory. It still also searches for the full path. Previously it searched only for the full path in out-of-tree builds, making the debug information generated by Debian's buildds rather hard to use. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | mips: rename mipsdspr1 to mipsdspVicente Olivert Riera2015-12-041-1/+1
| | | | | | | | | | Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Makefile: add cleanup of pkg-config files created by configure to distcleanTobias Rapp2015-12-021-0/+1
| | | | | | | | Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | Merge commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8'Hendrik Leppkes2015-10-221-0/+1
|\ \ | |/ | | | | | | | | | | * commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8': avconv: add support for Intel QSV-accelerated transcoding Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avconv: add support for Intel QSV-accelerated transcodingAnton Khirnov2015-10-161-0/+1
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * build: add Solaris symbol versioningSean McGovern2015-10-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The versioning facility in the Solaris linker differs from Linux in 3 ways: 1. It does not support globs in linker scripts for symbol versioning -- this is a GNU extension. 2. The linker argument is '-M', instead of '--version-script'. 3. It is picky about line endings. Each symbol or directive must be on a line of it's own. Let's use make_sunver.pl from GCC to generate a version script that works correctly with the Solaris linker. It's function is to correctly expand the globs in the original generated version script. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avcodec: add new Videotoolbox hwaccel.Sebastien Zwickert2015-08-031-1/+4
| |
* | Merge commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5'Michael Niedermayer2015-07-221-0/+1
|\ \ | |/ | | | | | | | | | | * commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5': checkasm: Always link statically Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * checkasm: Always link staticallyLuca Barbato2015-07-211-0/+1
| | | | | | | | Checkasm needs to use internal symbols that should not be made public.
* | use mmi instead of loongson3 as simd-optimization flag周晓勇2015-07-071-1/+1
| | | | | | | | | | Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1316df7aa98c4784f190d107206d0bb12c590b89'Michael Niedermayer2015-07-031-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1316df7aa98c4784f190d107206d0bb12c590b89': lavu: add an API function to return the Libav version string Conflicts: .gitignore Makefile cmdutils.c doc/APIchanges libavutil/avutil.h libavutil/utils.c See: f91126643a91c2d3f8d8e210c8facaf259951b03 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: add an API function to return the Libav version stringwm42015-07-021-3/+3
| | | | | | | | | | | | | | | | This returns something like "v12_dev0-1332-g333a27c". This is much more useful than the individual library versions, of which there are too many, and which are very hard to map back to releases or git commits. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | makefile: add Loongson-3 supportZhouXiaoyong2015-04-271-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Makefile: Add support for MSA (MIPS-SIMD-Arch)Shivraj Patil2015-04-171-1/+1
| | | | | | | | | | | | Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com> Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure, mips: remove MIPS32R2, merging it with MIPSFPUJames Cowgill2015-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are no independant uses of mips32r2 instructions except for the FPU parts. Due to the heavy use of mips32r2 specifc fpu extensions, I am guessing the original author intended MIPSFPU to imply MIPS32R2 anyway. Since these fpu instructions are available on mips64 (non-r2), enable them there as well. Also remove the last occurence of HAVE_MIPS32R2 (which is coupled to HAVE_MIPSFPU anyway). mips32r2 is left in the list of options form compatability so that using --disable-mips32r2 doesn't break anything. Signed-off-by: James Cowgill <james410@cowgill.org.uk> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Makefile: add dependencies which require ffversion.hMichael Niedermayer2014-12-201-1/+1
| | | | | | | | | | | | Without this ffversion.h could sometimes be built too late Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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>
OpenPOWER on IntegriCloud