summaryrefslogtreecommitdiffstats
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* dxva: add support for new dxva2 and d3d11 hwaccel APIswm42017-06-271-1/+0
| | | | | | | | | | | | | | | This also adds support to avconv (which is trivial due to the new hwaccel API being generic enough). The new decoder setup code in dxva2.c is significantly based on work by Steve Lhomme <robux4@gmail.com>, but with heavy changes/rewrites. Merges Libav commit f9e7a2f95a7194a8736cc1416a03a1a0155a3e9f. Also adds untested VP9 support. The check for DXVA2 COBJs is removed. Just update your MinGW to something newer than a 5 year old release. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* build: Generalize yasm/nasm-related variable namesDiego Biurrun2017-06-211-1/+1
| | | | | | | | None of them are specific to the YASM assembler. (Cherry-picked from libav commit 39e208f4d4756367c7cd2d581847e0c1b8a429c1) Signed-off-by: James Almer <jamrial@gmail.com>
* ffmpeg: Enable generic hwaccel support for VDPAUMark Thompson2017-06-141-1/+0
| | | | (cherry picked from commit aa6b2e081c504cb99f5e2e0ceb45295ef24bdac2)
* ffmpeg: Enable generic hwaccel support for VAAPIMark Thompson2017-06-141-1/+0
| | | | (cherry picked from commit 62a1ef9f26c654a3e988aa465c4ac1d776c4c356)
* ffmpeg: Generic device setupMark Thompson2017-06-141-1/+1
| | | | | | | Not yet enabled for any hwaccels. (cherry picked from commit d2e6dd32a445b5744a51d090c0822dbd7e434592) (cherry picked from commit 9203aac22874c7259e155b7d00f1f33bb1355129)
* tools: add sofa2wavsPaul B Mahol2017-06-121-0/+1
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* build: remove --enable-raise-major configure optionJames Almer2017-05-171-6/+0
| | | | | | | | It's not used by anything, has dubious usefulness, the reasons for which it was introduced are no longer valid, and only serves to add complexity to the build system. Signed-off-by: James Almer <jamrial@gmail.com>
* build: add support for building .cu files via nvccTimo Rothenpieler2017-05-151-0/+2
| | | | Original work by Yogender Gupta <ygupta@nvidia.com>
* Merge commit '122de16dd8108a59a55d30543c9f28b5f61b02d1'Clément Bœsch2017-05-051-2/+1
|\ | | | | | | | | | | | | * commit '122de16dd8108a59a55d30543c9f28b5f61b02d1': Replace cmdutils_common_opts.h by a macro Merged-by: Clément Bœsch <cboesch@gopro.com>
| * Replace cmdutils_common_opts.h by a macroDiego Biurrun2017-01-121-2/+1
| |
| * build: Remove stray duplicate conditional variable declarationDiego Biurrun2017-01-121-2/+0
| |
* | Merge commit '92db5083077a8b0f8e1050507671b456fd155125'James Almer2017-05-041-1/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit '92db5083077a8b0f8e1050507671b456fd155125': build: Generate pkg-config files from Make and not from configure build: Store library version numbers in .version files Includes cherry-picked commits 8a34f3659371680ca523aecfd9098c28f0f809eb and ee164727dd64c199b87118917e674b17c25e0da3 to fix issues. Changes were also made to retain support for raise_major and build_suffix. Reviewed-by: ubitux Merged-by: James Almer <jamrial@gmail.com>
| * build: Generate pkg-config files from Make and not from configureDiego Biurrun2016-12-221-2/+1
| | | | | | | | | | | | | | | | This moves work from the configure to the Make stage where it can be parallelized and ensures that pkgconfig files are updated when library versions change. Bug-Id: 449
| * build: Store library version numbers in .version filesDiego Biurrun2016-12-221-1/+1
| | | | | | | | | | | | This moves work from the configure to the Make stage where it can be parallelized and ensures that shared libraries are built with the right version number in the filename.
* | Merge commit '11a9320de54759340531177c9f2b1e31e6112cc2'Clément Bœsch2017-05-031-8/+11
|\ \ | |/ | | | | | | | | | | | | | | * commit '11a9320de54759340531177c9f2b1e31e6112cc2': build: Move build-system-related helper files to a separate subdirectory "ffbuild" directory name is used instead of "avbuild". Merged-by: Clément Bœsch <u@pkh.me>
| * build: Move build-system-related helper files to a separate subdirectoryDiego Biurrun2016-12-221-9/+10
| | | | | | | | This unclutters the top-level directory and groups related files together.
* | Make tools/target_dec_*_fuzzer buildable with configure and makeMichael Niedermayer2017-04-241-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'be2d555c980220e65d0ca5c3d78e6cc1e24451a5'Clément Bœsch2017-04-171-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'be2d555c980220e65d0ca5c3d78e6cc1e24451a5': build: Use _extralibs variable names instead of _libs everywhere Merged-by: Clément Bœsch <u@pkh.me>
| * build: Use _extralibs variable names instead of _libs everywhereDiego Biurrun2016-12-091-1/+1
| | | | | | | | This makes naming more consistent and simplifies extralibs-related changes.
* | build: fix tools build dependenciesJames Almer2017-04-131-0/+4
| | | | | | | | | | Found-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit 'c833c2034f4ee77fe2ee3470f3f5f84415673b3b'James Almer2017-04-131-0/+3
|\ \ | |/ | | | | | | | | | | * commit 'c833c2034f4ee77fe2ee3470f3f5f84415673b3b': build: Ensure that the "all" target appears before all Makefile includes Merged-by: James Almer <jamrial@gmail.com>
| * build: Ensure that the "all" target appears before all Makefile includesDiego Biurrun2016-12-071-0/+3
| | | | | | | | Otherwise builds without explicit target result in silent no-ops.
* | Merge commit '3e105d08848162b90d886bde59c010d4b0362a4b'James Almer2017-04-131-11/+1
|\ \ | |/ | | | | | | | | | | * commit '3e105d08848162b90d886bde59c010d4b0362a4b': build: Move entries related to building TOOLS to a subdirectory Makefile Merged-by: James Almer <jamrial@gmail.com>
| * build: Move entries related to building TOOLS to a subdirectory MakefileDiego Biurrun2016-12-071-7/+1
| |
* | Merge commit '4104cc56225f29ce1cded8b2876f8748460232a6'James Almer2017-04-131-1/+2
|\ \ | |/ | | | | | | | | | | * commit '4104cc56225f29ce1cded8b2876f8748460232a6': build: Warn that reconfiguration is necessary if version.h files changed Merged-by: James Almer <jamrial@gmail.com>
| * build: Warn that reconfiguration is necessary if version.h files changedDiego Biurrun2016-12-071-1/+2
| | | | | | | | | | The library versions are stored in the config.mak file and are used to derive shared library names.
| * build: Add EXTRALIBS to TOOLS linker commandDiego Biurrun2016-12-051-1/+1
| | | | | | | | | | EXTRALIBS contains general and platform-specific extra libraries that should be part of all linker commands.
* | Merge commit '3794062ab1a13442b06f6d76c54dce51ffa54697'Clément Bœsch2017-04-091-2/+2
|\ \ | |/ | | | | | | | | | | * commit '3794062ab1a13442b06f6d76c54dce51ffa54697': Remove Plan 9 support Merged-by: Clément Bœsch <u@pkh.me>
| * Remove Plan 9 supportDiego Biurrun2016-12-031-2/+2
| | | | | | | | | | | | Supporting the system was a nice joke for the 9 release, but it has run its course. Nowadays Plan 9 receives no testing and has no practical usefulness.
| * build: Hardcode avversion.h dependencyDiego Biurrun2016-10-271-0/+1
| | | | | | | | | | | | | | Since avversion.h is a generated header it must be created before dependencies can be determined as a side effect of compilation. Otherwise Make stops and restarts the build process to generate avversion.h and produces related error messages.
* | Merge commit '7c9e2b295e4f70e8fedf9cceb12d95399a859a9c'James Almer2017-03-231-1/+6
|\ \ | |/ | | | | | | | | | | * commit '7c9e2b295e4f70e8fedf9cceb12d95399a859a9c': Makefile: fix checking whether reconfiguring is required Merged-by: James Almer <jamrial@gmail.com>
| * Makefile: fix checking whether reconfiguring is requiredAnton Khirnov2016-10-211-1/+6
| | | | | | | | | | It didn't take into account the new pattern used for bitstream filters and protocols.
* | Merge commit 'd32571626a2c36c026b7fa13d19ac4ed1aad75c9'James Almer2017-03-231-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'd32571626a2c36c026b7fa13d19ac4ed1aad75c9': build: Add VSX-OBJS to SUBDIR_VARS Merged-by: James Almer <jamrial@gmail.com>
| * build: Add VSX-OBJS to SUBDIR_VARSDiego Biurrun2016-10-181-1/+1
| | | | | | | | The variable needs to be reset for each subdirectory.
| * build: Drop duplicate asm recipeDiego Biurrun2016-10-171-0/+5
| | | | | | | | | | And move the asm recipe to the top-level Makefile next to the other local pattern rules for .o files.
| * build: Simplify postprocessing of linker version script filesDiego Biurrun2016-05-291-3/+0
| | | | | | | | Generate the files in a single postprocessing step w/o intermediate files.
| * build: Change structure of the linker version script templatesDiego Biurrun2016-05-291-3/+1
| | | | | | | | | | | | Split version files into one line per symbol/directive to allow compatibility with the Solaris linker without preprocessing and eliminate $ from version file templates to simplify the postprocessing shell command.
| * build: Print a message when generating version scriptsDiego Biurrun2016-05-291-2/+2
| |
* | 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>
OpenPOWER on IntegriCloud