summaryrefslogtreecommitdiff
path: root/common.mak
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'afe176265480880e1f702c96a8ba434b0d88728b'Michael Niedermayer2014-05-201-1/+1
|\ | | | | | | | | | | | | | | | | | | * commit 'afe176265480880e1f702c96a8ba434b0d88728b': build: export library dependencies in ${name}_FFLIBS Conflicts: common.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: export library dependencies in ${name}_FFLIBSJanne Grunau2014-05-201-1/+1
| | | | | | | | | | Removes an ugly $(if) to avoid conflicts with $(FFLIBS-) in the top-level MAkefile.
* | Merge commit '7e90133f6420b1c53652f972b9561600822881ee'Michael Niedermayer2014-05-141-4/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '7e90133f6420b1c53652f972b9561600822881ee': build: do not append $(FFLIBS-) to $(FFLIBS) if $(NAME) is not defined Conflicts: common.mak See: efa95968317411179b0016af54745906029c2295 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: do not append $(FFLIBS-) to $(FFLIBS) if $(NAME) is not definedJanne Grunau2014-05-141-1/+1
| | | | | | | | Avoids including disabled library Makefiles.
* | common.mak: fix (not)building disabled libsMichael Niedermayer2014-05-131-1/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'Michael Niedermayer2014-05-131-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '449511740f06a4675b0066730fa45cdb764ffafc': build: handle library dependencies in configure Conflicts: common.mak configure libavdevice/Makefile libavfilter/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: handle library dependencies in configureJanne Grunau2014-05-131-1/+1
| | | | | | | | | | Instead of setting FFLIBS in each library Makefile configure exports FFLIBS-$library in config.mak.
* | lavd: Add QTKit input device.Vadim Kalinsky2014-03-301-0/+3
| | | | | | | | | | Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'Michael Niedermayer2014-02-171-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90': Move all example programs to doc/examples Conflicts: configure doc/Makefile doc/doxy-wrapper.sh doc/examples/avcodec.c doc/examples/decoding_encoding.c doc/examples/metadata.c doc/examples/muxing.c doc/examples/transcode_aac.c libavcodec/Makefile libavcodec/api-example.c libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Move all example programs to doc/examplesDiego Biurrun2014-02-161-1/+0
| | | | | | | | Also drop support for building examples in library directories.
* | common.mak: Less ugly version of the previous windres fixJames Almer2013-12-091-1/+1
| | | | | | | | | | | | | | Using subst here is a really ugly hack Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | common.mak: fix the current fate failures with windresJames Almer2013-12-091-1/+1
| | | | | | | | | | Tested-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | windres: Track dependenciesJames Almer2013-12-071-2/+2
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add Windows resource file support for shared librariesJames Almer2013-12-051-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit '5a9fcc7d2524d6c0f86b2855019ee9f4cf360276'Michael Niedermayer2013-12-021-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '5a9fcc7d2524d6c0f86b2855019ee9f4cf360276': build: Add rule for building host-specific object files Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ad477710244c761ad1c21246c34e0075fee12d11'Michael Niedermayer2013-12-021-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'ad477710244c761ad1c21246c34e0075fee12d11': build: Add shorthand for HOSTCC compile macro Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Add shorthand for HOSTCC compile macroDiego Biurrun2013-12-021-1/+1
| |
* | Merge commit 'e8fcdebb17fc59375fd9fc6c0a02a1d2e6d9fb23'Michael Niedermayer2013-11-151-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'e8fcdebb17fc59375fd9fc6c0a02a1d2e6d9fb23': build: Allow specifying extra object files when linking HOSTPROGS Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Allow specifying extra object files when linking HOSTPROGSDiego Biurrun2013-11-151-1/+1
| |
* | Merge commit '47b6cfc2a0333fb24f074d27830bf35ae5007050'Michael Niedermayer2013-10-041-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '47b6cfc2a0333fb24f074d27830bf35ae5007050': avformat/output-example: Declare link dependency on libswscale in the Makefile Conflicts: libavformat/Makefile Changes to libavformat/Makefile are not merged as our build system for the examples is different. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat/output-example: Declare link dependency on libswscale in the MakefileDiego Biurrun2013-10-031-1/+2
| |
| * Integrate lcov/gcov into LibavReinhard Tartler2013-04-051-1/+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 '472391b9a7e15e3bff33b016e7b6dbfa6a555975'Michael Niedermayer2013-03-281-0/+1
|\ \ | |/ | | | | | | | | | | | | * commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975': ape: use correct context for the bit table printed in debug build: Move setting of SRC_DIR to the only place it is used Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Move setting of SRC_DIR to the only place it is usedDiego Biurrun2013-03-271-0/+1
| |
* | Merge commit '4cc4b33f71d3982df404fceb4405d656c538bc74'Michael Niedermayer2013-02-241-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '4cc4b33f71d3982df404fceb4405d656c538bc74': build: Add proper infrastructure for adding and checking host CPPFLAGS Conflicts: Makefile configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8a11ce43d08352f7a290355ebb5b29c495ad9609'Michael Niedermayer2013-02-201-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '8a11ce43d08352f7a290355ebb5b29c495ad9609': build: Ensure that output directories for header objects are created h264: Get rid of unnecessary casts Conflicts: common.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Ensure that output directories for header objects are createdDiego Biurrun2013-02-201-1/+2
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-111-0/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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-0/+6
| | | | | | | | | | | | | | | | 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 '4a606c830ae664013cea33800094d4d0f4ec62da'Michael Niedermayer2012-11-231-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'Michael Niedermayer2012-10-311-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '04581c8c77ce779e4e70684ac45302972766be0f': x86: yasm: Use complete source path for macro helper %includes Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-261-0/+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-0/+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 remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-161-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegvideo: drop unnecessary arguments to hpel_motion() mpegvideo: drop 'inline' from some functions nellymoserdec: drop support for s16 output. bmpdec: only initialize palette for pal8. build: Properly remove object files while cleaning flacdsp: arm optimised lpc filter compat/vsnprintf: return number of bytes required on truncation. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Properly remove object files while cleaningMans Rullgard2012-09-151-0/+3
| | | | | | | | | | | | | | Previously, object files in, for example, compat/ were left after a clean or distclean was run. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-301-2/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: build: allow non-standard variations of linker -l/-L flags Add reminders to update the codec descriptor list with new codec IDs. Conflicts: Makefile configure libavcodec/avcodec.h libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: allow non-standard variations of linker -l/-L flagsMans Rullgard2012-08-291-1/+2
| | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-291-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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: 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-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * build: Use portable abstraction for linker/hostcc output file syntaxDiego Biurrun2012-08-271-1/+1
| |
* | checkheaders: Rename HEADEROBJS to HOBJSjamal2012-08-091-6/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | common.mak: add forgotten hunk from last mergeMichael Niedermayer2012-08-091-2/+2
| | | | | | | | | | | | Found-by: jamal <jamrial@gmail.com> Author of the hunk: Mans Rullgard <mans@mansr.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-091-6/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) build: cosmetics: Reorder some lists in a more logical fashion x86: pngdsp: Fix assembly for OS/2 fate: add test for RTjpeg in nuv with frameheader rtmp: send check_bw as notification g723_1: clip argument for 15-bit version of normalize_bits() g723_1: use all LPC vectors in formant postfilter id3v2: Support v2.2 PIC avplay: fix build with lavfi disabled. avconv: split configuring filter configuration to a separate file. avconv: split option parsing into a separate file. mpc8: do not leave padding after last frame in buffer for the next decode call mpegaudioenc: list supported channel layouts. mpegaudiodec: don't print an error on > 1 frame in a packet. api-example: update to new audio encoding API. configure: add --enable/disable-random option doc: cygwin: Update list of FATE package requirements build: Remove all installed headers and header directories on uninstall build: change checkheaders to use regular build rules rtmp: Add a new option 'rtmp_subscribe' rtmp: Add support for subscribing live streams ... Conflicts: Makefile common.mak configure doc/examples/decoding_encoding.c ffmpeg.c libavcodec/g723_1.c libavcodec/mpegaudiodec.c libavcodec/x86/pngdsp.asm libavformat/version.h library.mak tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: change checkheaders to use regular build rulesMans Rullgard2012-08-071-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Many compilers need special flags to compile *.h files as regular source code, if they will do so at all. Rather than hoping all compilers will have such a flag and adding mappings for it, create wrapper .c files for test building single headers. This allows using the regular rule for compiling C files without the need for special flags, and it also provides proper dependency tracking for these objects. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-071-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: x86: fix build with nasm 2.08 x86: use nop cpu directives only if supported x86: fix rNmp macros with nasm build: add trailing / to yasm/nasm -I flags x86: use 32-bit source registers with movd instruction x86: add colons after labels Conflicts: Makefile libavutil/x86/x86inc.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | checkheaders: Fix directory creation in out-of-tree builds.jamal2012-08-071-6/+8
| | | | | | | | | | | | | | | | checkheaders wasn't creating folders as needed, so if it was run immediately after the configure script it would fail as soon as it tried to compile headers inside the ARCH folders. Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
* | buildsys: fix c++ compilationMichael Niedermayer2012-07-301-1/+1
| | | | | | | | | | Based on code by: carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-291-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (35 commits) h264_idct_10bit: port x86 assembly to cpuflags. x86inc: clip num_args to 7 on x86-32. x86inc: sync to latest version from x264. fft: rename "z" to "zc" to prevent name collision. wv: return meaningful error codes. wv: return AVERROR_EOF on EOF, not EIO. mp3dec: forward errors for av_get_packet(). mp3dec: remove a pointless local variable. mp3dec: remove commented out cruft. lavfi: bump minor to mark stabilizing the ABI. FATE: add tests for yadif. FATE: add a test for delogo video filter. FATE: add a test for amix audio filter. audiogen: allow specifying random seed as a commandline parameter. vc1dec: Override invalid macroblock quantizer vc1: avoid reading beyond the last line in vc1_draw_sprites() vc1dec: check that coded slice positions and interlacing match. vc1dec: Do not ignore ff_vc1_parse_frame_header_adv return value configure: Move parts that should not be user-selectable to CONFIG_EXTRA lavf: remove commented out cruft in avformat_find_stream_info() ... Conflicts: Makefile configure libavcodec/vc1dec.c libavcodec/x86/h264_deblock.asm libavcodec/x86/h264_deblock_10bit.asm libavcodec/x86/h264dsp_mmx.c libavfilter/version.h libavformat/mp3dec.c libavformat/utils.c libavformat/wv.c libavutil/x86/x86inc.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-271-7/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: proresdsp: port x86 assembly to cpuflags. lavr: x86: improve non-SSE4 version of S16_TO_S32_SX macro lavfi: better channel layout negotiation alac: check for truncated packets alac: reverse lpc coeff order, simplify filter lavr: add x86-optimized mixing functions x86: add support for fmaddps fma4 instruction with abstraction to avx/sse tscc2: fix typo in array index build: use COMPILE template for HOSTOBJS build: do full flag handling for all compiler-type tools eval: fix printing of NaN in eval fate test. build: Rename aandct component to more descriptive aandcttables mpegaudio: bury inline asm under HAVE_INLINE_ASM. x86inc: automatically insert vzeroupper for YMM functions. rtmp: Check the buffer length of ping packets rtmp: Allow having more unknown data at the end of a chunk size packet without failing rtmp: Prevent reading outside of an allocate buffer when receiving server bandwidth packets Conflicts: Makefile configure libavcodec/x86/proresdsp.asm libavutil/eval.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status