summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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>
* | Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'Michael Niedermayer2012-12-081-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'b326755989b346d0d935e0628e8865f9b2951c30': arm: rename ARMVFP config symbol to VFP Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: rename ARMVFP config symbol to VFPMans Rullgard2012-12-071-1/+1
| | | | | | | | | | | | | | 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>
* | Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da'Michael Niedermayer2012-11-231-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * build: add rules to generate preprocessed source filesMans Rullgard2012-11-231-0/+3
| | | | | | | | | | | | | | 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>
| * x86: yasm: Use complete source path for macro helper %includesDiego Biurrun2012-10-311-1/+1
| | | | | | | | | | This is more consistent with the way we handle C #includes and it simplifies the build system.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-261-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * build: Include HEADERS-yes in the HEADERS variableMartin Storsjö2012-10-251-1/+1
| | | | | | | | | | | | | | This makes sure the previously always installed public header lzo.h is installed if the LZO functionality is enabled. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '80521c1997a23e148edf89e11b939ab8646297ca'Michael Niedermayer2012-10-241-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * build: allow targets to specify extra objects to link with executablesMans Rullgard2012-10-231-4/+4
| | | | | | | | | | | | | | This allows targets to include special objects when linking executables without including them in (shared) libraries. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-161-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * qatar/master: build: simplify linking tools with cmdutils.o tiny_psnr: fix range calculation for sample size of 32 bits Conflicts: Makefile tests/tiny_psnr.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: simplify linking tools with cmdutils.oMans Rullgard2012-10-151-4/+4
| | | | | | | | | | | | | | This avoids repeating cmdutils.o in both the prerequisites and the link command. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | examples: add README file with simple compilation instructionsStefano Sabatini2012-10-161-1/+1
| |
* | Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f'Michael Niedermayer2012-10-131-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ca411fc1d34329cd17b28627f697e391ae52073f': avcodec: Remove broken MMI optimizations Conflicts: arch.mak configure libavcodec/avcodec.h libavcodec/mips/Makefile libavcodec/mips/dsputil_mmi.c libavcodec/mips/idct_mmi.c libavcodec/mips/mmi.h libavcodec/mips/mpegvideo_mmi.c libavcodec/options_table.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: Remove broken MMI optimizationsDiego Biurrun2012-10-121-1/+1
| | | | | | | | The code fails to compile and is broken beyond repair.
| * build: allow non-standard variations of linker -l/-L flagsMans Rullgard2012-08-291-1/+1
| | | | | | | | | | | | | | | | | | This enables replacing the -l and -L flags used to specify the just-built libraries when linking the tools and shared libs with non-standard syntaxes. System library flags are already handled by the filtering mechanism in configure. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Makefile: remove old codec_names.h on distcleanMichael Niedermayer2012-09-071-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-291-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: build: export filtered -lz flag in config.mak build: add separate setting for host linker configure: probe_cc: use separate variable for linker output flag x86: Always compile files with functions that are called unconditionally x86: mpegvideoenc: fix linking with --disable-mmx x86: mpegvideoenc: Do not abuse HAVE_ variables for template instantiation Conflicts: Makefile configure libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: export filtered -lz flag in config.makMans Rullgard2012-08-281-1/+1
| | | | | | | | | | | | | | This is needed to link tools/cws2fws using a linker with non-standard command line syntax. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * build: add separate setting for host linkerMans Rullgard2012-08-281-1/+1
| | | | | | | | | | | | | | This adds new HOSTLD and related settings for host linker allowing it to be different from HOSTCC. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-281-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vc1: export some functions configure: use HOSTCC_C/O in check_host_cc configure: use AS_O setting in check_as configure: use LD_O setting in check_ld() Revert "dsputil: make {add/put/put_signed}_pixels_clamped() non-static." build: Restore dependency of acelp_filters.o on celp_math.o celp_math: Replace duplicate ff_dot_productf() by ff_scalarproduct_c() celp_math: Move ff_cos() to the only place it is used build: Use portable abstraction for linker/hostcc output file syntax configure: Fix shared library creation for OpenBSD vp56: Don't use DECLARE_ALIGN on a typedef name mss1: move code that will be reused by MSS2 decoder into separate file mss1: merge decode_intra() and decode_inter() avprobe: Get rid of ugly casts in the options table vf_hqdn3d: Remove a duplicate inline declaration Conflicts: Makefile configure ffprobe.c libavcodec/Makefile libavcodec/amrnbdec.c libavcodec/amrwbdec.c libavcodec/celp_math.c libavcodec/celp_math.h libavcodec/dsputil.c libavcodec/lsp.c libavcodec/mss1.c libavcodec/ra288.c libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status