summaryrefslogtreecommitdiffstats
path: root/library.mak
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830'Michael Niedermayer2014-07-221-1/+1
|\ | | | | | | | | | | | | | | | | | | * commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830': build: Support executable only ldflags Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Support executable only ldflagsLuca Barbato2014-07-211-1/+1
| | | | | | | | | | The options is useful to build position-independent executables on hardened systems (e.g. Android L and Gentoo Hardened).
* | Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'Michael Niedermayer2014-02-171-8/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-8/+6
| | | | | | | | Also drop support for building examples in library directories.
* | Merge commit '3a26ccbf0d9f806d067e76a3f484170abecb36b3'Michael Niedermayer2014-02-141-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '3a26ccbf0d9f806d067e76a3f484170abecb36b3': build: doxy: Include code examples in Doxygen documentation Conflicts: doc/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: doxy: Include code examples in Doxygen documentationDiego Biurrun2014-02-141-0/+1
| |
* | Add Windows resource file support for shared librariesJames Almer2013-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | library.mak: only run asm strip if ASMSTRIP flags are setMichael Niedermayer2013-11-281-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | build sys: rename STRIPFLAGS to ASMSTRIPFLAGSMichael Niedermayer2013-11-281-1/+1
| | | | | | | | | | | | | | This more closely matches the actual use, also we use plain strip without these flags for striping Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '0673ede985a6560e7efb86dab1c58fb7f95ce587'Michael Niedermayer2013-11-281-1/+1
|\ \ | |/ | | | | | | | | | | * commit '0673ede985a6560e7efb86dab1c58fb7f95ce587': configure: add strip flags checks Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: add strip flags checksVittorio Giovara2013-11-281-1/+1
| | | | | | | | | | | | This will check if -wN '..@*' is available and fall back on -x if not; when none are available, do not run strip at all to prevent removing functions that might be actually needed.
| * build: remove pointless conditionIngo Brückl2013-10-291-1/+1
| | | | | | | | | | | | | | | | $(STRIP) always expands to something, because it is one of the commands in the BRIEF list. This renders the condition pointless. Signed-off-by: Ingo Brückl <ib@wupperonline.de> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | build: remove pointless conditionIngo Brückl2013-10-241-1/+1
| | | | | | | | | | | | | | | | $(STRIP) always expands to something, because it is one of the commands in the BRIEF list. This renders the condition pointless. Signed-off-by: Ingo Brückl <ib@wupperonline.de> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit 'e52567c2954f627d420b30f75f71af2f2e4afe80'Michael Niedermayer2013-10-081-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'e52567c2954f627d420b30f75f71af2f2e4afe80': build: Strip spurious labels Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Strip spurious labelsLoren Merritt2013-10-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation of 25cb0c1a involves lots of spurious labels. The effect of keeping those labels around is making debugging harder. Those labels are meaningless, and complicate the disassembly. Also, gdb can't tell the difference between them and function entry points. This new strip command is irrelevant to any usage of Libav that would have used the old fully stripped version, because the old one was for non-debug use. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'Michael Niedermayer2013-03-281-2/+0
|\ \ | |/ | | | | | | | | | | | | * 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-2/+0
| |
* | build: fixes a "can't cd to..." issue when installing shared libraries.Cyrille Faucheux2013-02-151-1/+1
| | | | | | | | The problem is reproducible with a relative prefix path.
* | Merge commit '304b806cb524fb040f8e09a241040f1af2cb820b'Michael Niedermayer2013-02-121-0/+1
|\ \ | |/ | | | | | | | | | | | | * commit '304b806cb524fb040f8e09a241040f1af2cb820b': build: Make library minor version visible in the Makefile x86: mpeg4qpel: Make movsxifnidn do the right thing Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Make library minor version visible in the MakefileDiego Biurrun2013-02-111-0/+1
| | | | | | | | This allows employing that number in library install commands.
* | build: Remove superfluous MAKE variable for the build suffixJames Almer2013-02-031-2/+2
| | | | | | | | | | | | | | Use BUILDSUF instead. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | build-sys: Fix pkgconfig files when ffmpeg is built with --build-suffixSteven Boswell II2013-02-021-2/+2
| | | | | | | | | | | | | | Tested-on: Fedora Core 14, 16, and 17. Tested-on: Ubuntu by commiter Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-111-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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/+1
| | | | | | | | | | | | | | | | 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-2/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 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-2/+9
| | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-11-031-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * qatar/master: doc: add apidoc target for doxygen API documentation matroskadec: do not use avpacket internals Conflicts: doc/Makefile libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: add apidoc target for doxygen API documentationJanne Grunau2012-11-021-0/+2
| | | | | | | | | | | | | | | | | | Documentation includes only the externally visible API of the installed headers. Based on a patch by Anton Khirnov <anton@khirnov.net>. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '80521c1997a23e148edf89e11b939ab8646297ca'Michael Niedermayer2012-10-241-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-1/+1
| | | | | | | | | | | | | | 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-111-6/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mlpdsp: adding missing file dsputil: split out mlp dsp function sh4: add required #include, fix build averror: make error values proper negative values build: do not use LIB as variable name build: whitespace cosmetics build: remove single-use variable THIS_LIB Conflicts: libavutil/error.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: do not use LIB as variable nameMans Rullgard2012-10-101-3/+3
| | | | | | | | | | | | | | The Microsoft linker uses the LIB environment variable which clashes with a make variable of the same name. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * build: whitespace cosmeticsMans Rullgard2012-10-101-1/+1
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * build: remove single-use variable THIS_LIBMans Rullgard2012-10-101-2/+1
| | | | | | | | | | | | Replace the single use of THIS_LIB with its value. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'Michael Niedermayer2012-10-111-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4436f25a1682ada3f7226cb6fadf429946933161': build: remove references to unused EXTRAOBJS variable lavfi: convert input/ouput list compound literals to named objects fate: add h263 obmc vsynth tests avconv: remove bogus warning when using avconv -h without parameter averror: explicitly define AVERROR_* values flashsv: propagate inflateReset() errors indeo4/5: remove constant parameter num_bands from wavelet recomposition mxfdec: return error if no segments are available in mxf_get_sorted_table_segments Double motion vector range for HPEL interlaced picture in proper place Conflicts: libavcodec/v210dec.h libavfilter/af_aformat.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_channelmap.c libavfilter/af_join.c libavfilter/asrc_anullsrc.c libavfilter/buffersrc.c libavfilter/f_setpts.c libavfilter/f_settb.c libavfilter/fifo.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fieldorder.c libavfilter/vf_fps.c libavfilter/vf_hflip.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_select.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/vsrc_testsrc.c libavformat/mxfdec.c libavutil/error.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: remove references to unused EXTRAOBJS variableMans Rullgard2012-10-101-2/+2
| | | | | | | | | | | | This was part of a ghastly hack that is long since gone. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-101-1/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * qatar/master: build: sanitize linking of tools and test programs fate: Refactor setting of environment variables for groups of tests Conflicts: tests/fate/audio.mak tests/fate/real.mak tests/fate/voice.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: sanitize linking of tools and test programsMans Rullgard2012-10-101-1/+4
| | | | | | | | | | | | | | | | | | This makes sure proper linker arguments are used for the tools and test programs when shared libraries are enabled. The tools are linked using the usual -l flag while for test programs the full name of the static library is used. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a'Michael Niedermayer2012-10-101-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a': cmdutils_read_file: increment *size after writing the trailing \0 af_resample: unref out_buf when avresample_convert returns 0 af_amix: prevent memory leak on error path vc1dec: prevent memory leak in error path vc1dec: prevent memory leak on av_realloc error af_channelmap: free old extended_data on reallocation avconv: simplify memory allocation in copy_chapters matroskaenc: check cue point validity before reallocation swfenc: error out for more than 1 audio or video stream build: link test programs only against static libs Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: link test programs only against static libsMans Rullgard2012-10-091-3/+3
| | | | | | | | | | | | | | | | | | | | The test programs use internal symbols so cannot be linked against the shared libs. Linking against both shared and static is pointless and might do something strange depending on the linker. This changes the dependencies so the test programs are linked only against the static library for the component they belong to. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge commit '581281e242609a222233a2e5538b89dfb88fb18e'Michael Niedermayer2012-09-201-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '581281e242609a222233a2e5538b89dfb88fb18e': matroskadec: check realloc in lzo encoding matroska: honor error_recognition on unknown doctypes tiffdec: Add support for GRAY16LE. tiffenc: Add support for little endian RGB48 and GRAY16 mpeg4: support frame parameter changes with frame-mt mpegvideo: check ff_find_unused_picture() return value for errors mpegvideo: release frame buffers before freeing them configure: msvc: default to 'lib' as 'ar' tool build: support some non-standard ar variants Conflicts: libavcodec/h263dec.c libavcodec/mpegvideo.c libavcodec/tiff.c libavcodec/tiffenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: support some non-standard ar variantsMans Rullgard2012-09-191-1/+1
| | | | | | | | | | | | | | This adds support for the TI and Microsoft (lib.exe) variants of the ar utility. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-301-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 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/+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>
* | 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>
| * build: Use portable abstraction for linker/hostcc output file syntaxDiego Biurrun2012-08-271-2/+2
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-091-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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: Remove all installed headers and header directories on uninstallDiego Biurrun2012-08-071-2/+2
| |
| * build: change checkheaders to use regular build rulesMans Rullgard2012-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 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: Fix some paths in uninstall-libsjamal2012-08-071-2/+2
| | | | | | | | | | | | | | Folder and file names weren't being separated with a slash. This resulted in .dll.a, .lib and .def files not being removed on uninstall. Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
OpenPOWER on IntegriCloud