summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-11
|\ | | | | | | | | | | | | | | | | | | | | * 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-10
| | | | | | | | | | | | | | | | 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-08
|\| | | | | | | | | | | | | * 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-07
| | | | | | | | | | | | | | 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-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-23
| | | | | | | | | | | | | | 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-31
| | | | | | | | | | 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-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-25
| | | | | | | | | | | | | | 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-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-23
| | | | | | | | | | | | | | 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-16
|\| | | | | | | | | | | | | | | | | | | | | | | * 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-15
| | | | | | | | | | | | | | 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-16
| |
* | Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f'Michael Niedermayer2012-10-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-12
| | | | | | | | The code fails to compile and is broken beyond repair.
| * build: allow non-standard variations of linker -l/-L flagsMans Rullgard2012-08-29
| | | | | | | | | | | | | | | | | | 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-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-28
| | | | | | | | | | | | | | 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-28
| | | | | | | | | | | | | | 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-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-27
| |
* | build: Fix compilation when configuring with a prog suffixjamal2012-08-27
| | | | | | | | | | | | Fixes ticket #1676 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: motion_est: drop inline from sad_hpel_motion_search() motion_est: remove unused macros motion_est: remove useless no_motion_search() function lagarith: frame multithreading doxygen: qdm2: Drop documentation for non-existing function parameters build: add HOSTOBJS to SUBDIR_VARS list Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: add HOSTOBJS to SUBDIR_VARS listDiego Biurrun2012-08-09
| | | | | | | | | | Even though HOSTOBJS are not referenced directly in subdirectory Makefile snippets right now, robustness requires resetting the variable contents.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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: cosmetics: Reorder some lists in a more logical fashionDiego Biurrun2012-08-08
| |
| * avconv: split configuring filter configuration to a separate file.Anton Khirnov2012-08-08
| |
| * avconv: split option parsing into a separate file.Anton Khirnov2012-08-08
| |
| * build: change checkheaders to use regular build rulesMans Rullgard2012-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * build: add trailing / to yasm/nasm -I flagsMans Rullgard2012-08-07
| | | | | | | | | | | | | | nasm requires a trailing / on paths specified with -I. It does no harm with yasm. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: nuv: K&R formatting cosmetics build: generalise rules and variable settings for av* programs nuv: check RTjpeg header for validity Revert "nuv: check per-frame header for validity." imc: remove unused field IMCContext.one_div_log2 imc: fix size of a memset() imc: remove empty if() block fate: simplify variable setting filter.mak lavf: Declare an AVRational struct without a struct literal Conflicts: Makefile configure libavcodec/nuv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: generalise rules and variable settings for av* programsMans Rullgard2012-08-06
| | | | | | | | | | | | | | This simplifies adding extra flags for individual programs and also allows more than one object file per program. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * build: support non-standard replacements for -c flagMans Rullgard2012-07-28
| | | | | | | | | | | | | | | | This allows non-standard replacements for the -c compiler flag. Some compilers use other flags or no flag at all in place of the usual one. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * build: Use portable compiler flag constructs in header compilation ruleDiego Biurrun2012-07-28
| |
| * build: Rename YASMDEP variable to DEPYASM for consistencyDiego Biurrun2012-07-28
| |
| * build: use COMPILE template for HOSTOBJSMans Rullgard2012-07-26
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * build: do full flag handling for all compiler-type toolsMans Rullgard2012-07-26
| | | | | | | | | | | | | | This adds a full identification probe of CC, AS, LD and HOSTCC, and sets up correct flags and dependency tracking for each. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * build: Drop gcc-specific warning flag from header compilation ruleDiego Biurrun2012-07-22
| | | | | | | | | | | | The flag was added to avoid excessive warning spam, but nowadays those warnings no longer occur in such large numbers as to require silencing. Besides, gcc-specific flags do not belong in the Makefiles.
* | Makefile: remove checkheaders from the main check targetMichael Niedermayer2012-06-29
| | | | | | | | | | | | | | | | | | | | checkheaders doesnt pass and noone has even noticed since a very long time. checkheaders is also unmaintained (please add yourself to MAINTAINERS if you want to maintain it) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Optimization of AMR NB and WB decoders for MIPSNedeljko Babic2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AMR NB and WB decoders are optimized for MIPS architecture. Appropriate Makefiles are changed accordingly. Cnfigure script is changed in order to support optimizations. Optimizations are enabled by default when compiling is done for mips architecture. Appropriate cflags are automatically set. Support for several mips CPUs is added in configure script. New ffmpeg options are added for disabling optimizations. The FFMPEG option --disable-mipsfpu disables MIPS floating point optimizations. The FFMPEG option --disable-mips32r2 disables MIPS32R2 optimizations. The FFMPEG option --disable-mipsdspr1 disables MIPS DSP ASE R1 optimizations. The FFMPEG option --disable-mipsdspr2 disables MIPS DSP ASE R2 optimizations. Signed-off-by: Nedeljko Babic <nbabic@mips.com> Reviewed-by: Vitor Sessak <vitor1001@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/examples: install them with the shared data.Clément Bœsch2012-05-19
| |
* | build: remove non-existant examples rule.Clément Bœsch2012-05-19
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: Work around non-standard wc implementations at more places fate: work around non-standard wc implementations x86: rv40: Mark rv40_weight functions as MMX2; they use MMX2 instructions. ac3dsp: simplify x86 versions of ac3_max_msb_abs_int16 fate: use standard diff options tta: Fix comment about channel number; TTA supports >2 channels. avfilter: Move ff_get_ref_perms_string() to where it is used. build: Add 'check' target to run all compile and test targets. indeo3: validate new frame size before resetting decoder indeo3: when freeing buffers, set pointers referencing them to NULL as well indeo3: initialise pixel planes on allocation indeo3: ensure that decoded cell data is in 7-bit range as presumed by decoder fate: rename psx-str-v3-mdec to mdec-v3 fate: convert psx-str to a demuxer test lavf: add mdec to is_intra_only() list Conflicts: doc/developer.texi libavcodec/indeo3.c libavfilter/video.c libavformat/utils.c tests/fate/demux.mak tests/fate/video.mak tests/lavf-regression.sh tests/ref/vsynth1/cljr tests/ref/vsynth1/ffvhuff tests/ref/vsynth2/cljr tests/ref/vsynth2/ffvhuff Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Add 'check' target to run all compile and test targets.Diego Biurrun2012-05-15
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: FATE: use updated reference for aac-latm_stereo_to_51 avconv: use libavresample Add libavresample FATE: avoid channel mixing in lavf-dv_fmt Conflicts: Changelog Makefile cmdutils.c configure doc/APIchanges ffmpeg.c tests/lavf-regression.sh tests/ref/lavf/dv_fmt tests/ref/seek/lavf_dv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add libavresampleJustin Ruggles2012-04-24
| | | | | | | | | | This is a new library for audio sample format, channel layout, and sample rate conversion.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libxvid: remove disabled code qdm2: make a table static const qdm2: simplify bitstream reader setup for some subpacket types qdm2: use get_bits_left() build: Consistently handle conditional compilation for all optimization OBJS. avpacket, bfi, bgmc, rawenc: K&R prettyprinting cosmetics msrle: convert MS RLE decoding function to bytestream2. x86inc improvements for 64-bit Conflicts: common.mak libavcodec/avpacket.c libavcodec/bfi.c libavcodec/msrledec.c libavcodec/qdm2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Consistently handle conditional compilation for all optimization OBJS.Diego Biurrun2012-04-12
| |