Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-03-23Merge commit '93d5b022a9fd3a1a1f9c521a1eac7f0410e05b81'James Almer
* commit '93d5b022a9fd3a1a1f9c521a1eac7f0410e05b81': build: Drop duplicate asm recipe Merged-by: James Almer <jamrial@gmail.com>
2016-10-17build: Drop duplicate asm recipeDiego Biurrun
And move the asm recipe to the top-level Makefile next to the other local pattern rules for .o files.
2016-06-27Merge commit 'c5fd4b50610f62cbb3baa4f4108139363128dea1'Clément Bœsch
* commit 'c5fd4b50610f62cbb3baa4f4108139363128dea1': build: Simplify postprocessing of linker version script files Merged-by: Clément Bœsch <u@pkh.me>
2016-06-22Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196'Clément Bœsch
* commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196': tests: Move all test programs to a subdirectory Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-01library.mak: Put -Umain back for testsMichael Niedermayer
Fixes build on mingw32 with SDL reverts one line from 96d616052b3d39678e477fa10610ca688f46fff9 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-05-29build: Simplify postprocessing of linker version script filesDiego Biurrun
Generate the files in a single postprocessing step w/o intermediate files.
2016-05-13tests: Move all test programs to a subdirectoryDiego Biurrun
2016-05-11Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'Derek Buitenhuis
* commit 'd12b5b2f135aade4099f4b26b0fe678656158c13': build: Split test programs off into separate files Some conversions done by: James Almer <jamrial@gmail.com> Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-07build: Split test programs off into separate filesDiego Biurrun
This avoids spurious library rebuilds when only the test program code is changed and simplifies the build system.
2016-01-25build: use a link instead of changing current directory when compilingAndreas Cadhalpun
If links don't work, fall back to using the full source path as was previously done. This should fix build failures with MSVC. Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2016-01-22build: make out-of-tree builds bit-identical to in-tree buildsAndreas Cadhalpun
Previously the full source path was embedded inconsistently in the debug information between in-tree/out-of-tree builds. The 'vpath %.inc' becomes necessary for finding libavfilter/all_channel_layouts.inc in out-of-tree builds. The full source path is still embedded in the debug information, but it's now independent of whether building in-tree or out-of-tree. The biggest improvement of this patch is that gdb now always searches for the path relative to the source directory. It still also searches for the full path. Previously it searched only for the full path in out-of-tree builds, making the debug information generated by Debian's buildds rather hard to use. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-07-08build: add LDLIBFLAGSGanesh Ajjanagadde
Fixes Ticket4673 Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-19library.mak: Workaround SDL redefining main and breaking fate tests on mingwJames Almer
Fixes Ticket3368 Commit message by commiter Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-29build: add configure option pkgconfigdirIngo Brückl
This allows the user to override the directory for the installation of the pkg-config files (from the default LIBDIR/pkgconfig). It follows the usual behaviour of Makefiles generated by automake. Signed-off-by: Ingo Brückl <ib@wupperonline.de> Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17x86/doc/Makefile: DBG=1 to preprocess external asmChristophe Gisquet
The macro hell sometimes make it difficult to trace the source of an error, so it is easier to analyze the preprocessed output. This patch makes this automatical by specifying DBG=1 on the command line: a file ffmpeg/dir/file.asm gets preprocessed to builddir/dir/file.dbg.asm, which is then compiled. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22Merge commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830'Michael Niedermayer
* commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830': build: Support executable only ldflags Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22build: Support executable only ldflagsLuca Barbato
The options is useful to build position-independent executables on hardened systems (e.g. Android L and Gentoo Hardened).
2014-02-17Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'Michael Niedermayer
* 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>
2014-02-17Move all example programs to doc/examplesDiego Biurrun
Also drop support for building examples in library directories.
2014-02-14Merge commit '3a26ccbf0d9f806d067e76a3f484170abecb36b3'Michael Niedermayer
* commit '3a26ccbf0d9f806d067e76a3f484170abecb36b3': build: doxy: Include code examples in Doxygen documentation Conflicts: doc/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-14build: doxy: Include code examples in Doxygen documentationDiego Biurrun
2013-12-06Add Windows resource file support for shared librariesJames Almer
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>
2013-11-29library.mak: only run asm strip if ASMSTRIP flags are setMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-29build sys: rename STRIPFLAGS to ASMSTRIPFLAGSMichael Niedermayer
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>
2013-11-29Merge commit '0673ede985a6560e7efb86dab1c58fb7f95ce587'Michael Niedermayer
* commit '0673ede985a6560e7efb86dab1c58fb7f95ce587': configure: add strip flags checks Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-28configure: add strip flags checksVittorio Giovara
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.
2013-10-29build: remove pointless conditionIngo Brückl
$(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>
2013-10-24build: remove pointless conditionIngo Brückl
$(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>
2013-10-08Merge commit 'e52567c2954f627d420b30f75f71af2f2e4afe80'Michael Niedermayer
* commit 'e52567c2954f627d420b30f75f71af2f2e4afe80': build: Strip spurious labels Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-07build: Strip spurious labelsLoren Merritt
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>
2013-03-28Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'Michael Niedermayer
* 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>
2013-03-27build: Move setting of SRC_DIR to the only place it is usedDiego Biurrun
2013-02-15build: fixes a "can't cd to..." issue when installing shared libraries.Cyrille Faucheux
The problem is reproducible with a relative prefix path.
2013-02-12Merge commit '304b806cb524fb040f8e09a241040f1af2cb820b'Michael Niedermayer
* 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>
2013-02-11build: Make library minor version visible in the MakefileDiego Biurrun
This allows employing that number in library install commands.
2013-02-03build: Remove superfluous MAKE variable for the build suffixJames Almer
Use BUILDSUF instead. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-02build-sys: Fix pkgconfig files when ffmpeg is built with --build-suffixSteven Boswell II
Tested-on: Fedora Core 14, 16, and 17. Tested-on: Ubuntu by commiter Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-11Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: build: fix 'clean' target ZeroCodec: Flip output Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-10build: fix 'clean' targetMans Rullgard
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>
2012-11-23Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da'Michael Niedermayer
* 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>
2012-11-23build: add rules to generate preprocessed source filesMans Rullgard
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>
2012-11-03Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2012-11-02doc: add apidoc target for doxygen API documentationJanne Grunau
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>
2012-10-24Merge commit '80521c1997a23e148edf89e11b939ab8646297ca'Michael Niedermayer
* 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>
2012-10-23build: allow targets to specify extra objects to link with executablesMans Rullgard
This allows targets to include special objects when linking executables without including them in (shared) libraries. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-11Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2012-10-11Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'Michael Niedermayer
* 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>
2012-10-11build: remove references to unused EXTRAOBJS variableMans Rullgard
This was part of a ghastly hack that is long since gone. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-11build: do not use LIB as variable nameMans Rullgard
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>
2012-10-11build: whitespace cosmeticsMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>