Commit Graph

635 Commits

Author SHA1 Message Date
ZhouXiaoyong
4a7b50679d makefile: add Loongson-3 support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-27 14:10:28 +02:00
Shivraj Patil
35a7170e69 Makefile: Add support for MSA (MIPS-SIMD-Arch)
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-17 17:38:41 +02:00
James Cowgill
eae13eae9d configure, mips: remove MIPS32R2, merging it with MIPSFPU
There are no independant uses of mips32r2 instructions except for the
FPU parts. Due to the heavy use of mips32r2 specifc fpu extensions, I
am guessing the original author intended MIPSFPU to imply MIPS32R2 anyway.

Since these fpu instructions are available on mips64 (non-r2), enable them
there as well.

Also remove the last occurence of HAVE_MIPS32R2 (which is coupled to
HAVE_MIPSFPU anyway).

mips32r2 is left in the list of options form compatability so that using
--disable-mips32r2 doesn't break anything.

Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-06 14:01:31 +01:00
Michael Niedermayer
4ae87554f3 Makefile: add dependencies which require ffversion.h
Without this ffversion.h could sometimes be built too late

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-20 04:17:03 +01:00
Lukasz Marek
f524d2e47c ffserver: move configuration code to separate file
This commit doesn't change any existing logic.
It moves ffserver configuration related code to separate file.
It intends to make maintaining easier.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-10-22 22:37:40 +02:00
Michael Niedermayer
135b1a3f2c Merge commit 'd45ebd4876ab8fc07736a644de07e1b1d11a8e5d'
* commit 'd45ebd4876ab8fc07736a644de07e1b1d11a8e5d':
  configure: add support for neon intrinsics

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 03:06:43 +02:00
Michael Niedermayer
dac096cf39 Merge commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830'
* commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830':
  build: Support executable only ldflags

Conflicts:
	Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 02:45:45 +02:00
Janne Grunau
d45ebd4876 configure: add support for neon intrinsics 2014-07-21 23:18:29 +02:00
Luca Barbato
bb0babd705 build: Support executable only ldflags
The options is useful to build position-independent executables on
hardened systems (e.g. Android L and Gentoo Hardened).
2014-07-21 22:18:35 +02:00
Anton Khirnov
894682a973 Remove avserver.
It has not been properly maintained for years and there is little hope
of that changing in the future.
It appears simpler to write a new replacement from scratch than
unbreaking it.
2014-06-18 14:55:28 +02:00
Michael Niedermayer
fcb5849a62 Merge commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f'
* commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f':
  build: add avresample after avcodec to FFLIBS

Conflicts:
	Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-15 21:01:07 +02:00
Janne Grunau
5e2ba41d4b build: add avresample after avcodec to FFLIBS
avcodec might depend on avresample and with --as-needed required symbols
might be get removed if avresample is linked before avcodec.
Fixes link failures of avprobe and avplay on aarch64 with
--enable-neon-clobber-test.
2014-05-15 17:53:55 +02:00
Michael Niedermayer
5460ab73d2 Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'
* commit '1839fafa951308237c4672ffd9a94f927b26eac7':
  avconv: Support VDA hwaccel

Conflicts:
	Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-12 02:44:28 +02:00
Anton Khirnov
1839fafa95 avconv: Support VDA hwaccel
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-05-11 15:00:03 +02:00
Michael Niedermayer
21c7e99659 Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a'
* commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a':
  configure: rework dxva in avconv handling

Conflicts:
	Makefile
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29 01:47:53 +02:00
Michael Niedermayer
c6eee3120a Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'
* commit '35177ba77ff60a8b8839783f57e44bcc4214507a':
  avconv: add support for DXVA2 decoding

Conflicts:
	Makefile
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29 01:22:22 +02:00
Anton Khirnov
a61c2115fb configure: rework dxva in avconv handling
Move the dxva check after the dependencies have been detected, make sure
the ole32 library exists.

Fixes build on non-Windows.
2014-04-28 23:02:56 +02:00
Hendrik Leppkes
35177ba77f avconv: add support for DXVA2 decoding
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-04-28 21:21:54 +02:00
Michael Niedermayer
4c57c6a765 Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'
* commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14':
  aarch64: add armv8 CPU flag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-07 02:15:18 +02:00
Janne Grunau
8675bcb0ad aarch64: add armv8 CPU flag 2014-04-06 21:18:49 +02:00
Michael Niedermayer
9595f36700 Makefile: fix out of tree builds of .m files
should fix fate failures on darwin

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 05:12:39 +02:00
Michael Niedermayer
3fc2362aef Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143'
* commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143':
  Remove all SPARC architecture optimizations

Conflicts:
	Makefile
	configure
	libavcodec/sparc/dsputil_vis.c
	libavcodec/sparc/dsputil_vis.h
	libavcodec/sparc/hpeldsp_vis.c
	libavcodec/sparc/simple_idct_vis.c
	libavcodec/sparc/vis.h
	libswscale/sparc/yuv2rgb_vis.c
	libswscale/swscale_internal.h

If someone wants to maintain these (or other) SPARC optimizations, please
contact me or ffmpeg-devel.
I am happy to revert this removial if theres someone considering to
maintain this code.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-13 22:35:47 +01:00
Diego Biurrun
b4dd424d96 Remove all SPARC architecture optimizations
SPARC is no longer being used in any multimedia-related fields and the
VIS optimizations only represent a maintenance burden.
2014-03-13 05:50:28 -07:00
Nicolas George
8400368f31 tools: add uncoded_frame test program. 2014-02-11 10:31:29 +01:00
Lenny Wang
64f73acd1d cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices
Reviewed-by: Wei Gao <highgod0401@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09 21:21:36 +01:00
James Almer
56572787ae Add Windows resource file support for shared libraries
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-12-05 23:42:07 +01:00
Michael Niedermayer
4d0ac9aee9 Makefile: add dependancies for ffversion.h
It has to be build before the objects that use it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-03 01:30:04 +01:00
Diego Biurrun
5a9fcc7d25 build: Add rule for building host-specific object files 2013-12-02 13:13:09 +01:00
Diego Biurrun
ad47771024 build: Add shorthand for HOSTCC compile macro 2013-12-02 13:13:09 +01:00
Michael Niedermayer
16f4e2ab27 Makefile: remove version.h on distclean
Without this nothing will remove it even if it isnt generated in newer
versions anymore.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30 21:52:39 +01:00
Timothy Gu
82b2e9cb1d build: rename version.h to libavutil/ffversion.h
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>
2013-11-30 21:42:55 +01:00
Michael Niedermayer
875f9aea3e Merge commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c'
* commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c':
  Makefile: Fix building programs on systems with a nonempty executable suffix

Conflicts:
	Makefile

See: f1db007e00
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-27 02:09:16 +01:00
Martin Storsjö
dc80e2f7a5 Makefile: Fix building programs on systems with a nonempty executable suffix
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>
2013-11-26 23:31:09 +02:00
Michael Niedermayer
325c918fa3 Makefile: Fix building progs out of progs_g
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-26 02:06:41 +01:00
Michael Niedermayer
6d34aa245d Merge commit 'ab81f24ad43bddf77ddd25cba86780c1c884996c'
* 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>
2013-11-26 01:31:00 +01:00
Michael Niedermayer
5ded4332f1 Merge commit '14abeaa43d021afdce9119d906891abe89c03b88'
* commit '14abeaa43d021afdce9119d906891abe89c03b88':
  build: Separate building programs linking against libav* from building av*

Conflicts:
	Makefile
	doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-26 01:12:24 +01:00
Diego Biurrun
ab81f24ad4 build: Integrate multilibrary examples into the build system
This includes moving libavformat/output-example to doc/examples/output.
2013-11-25 11:57:29 -08:00
Diego Biurrun
14abeaa43d build: Separate building programs linking against libav* from building av*
This will allow cleaner integration of building example programs.
2013-11-25 11:57:29 -08:00
Michael Niedermayer
3e641b4842 Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'
* commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea':
  avconv: add support for VDPAU decoding

Conflicts:
	Changelog
	Makefile
	configure
	ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-23 14:46:48 +01:00
Anton Khirnov
7671dd7cd7 avconv: add support for VDPAU decoding 2013-11-23 11:55:53 +01:00
Michael Niedermayer
1a4ffa5b13 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  build: Remove redundant OBJS declaration intended for programs

Conflicts:
	Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 01:20:46 +01:00
Diego Biurrun
8b63ebcb03 build: Remove redundant OBJS declaration intended for programs 2013-11-03 18:52:11 +01:00
Diego Biurrun
c7f25d4c7f build: Ensure that strip commands are run silently 2013-10-31 11:48:59 +01:00
Michael Niedermayer
a4d3757b29 Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'
* commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d':
  w32pthreads: move from lavc to compat/

Conflicts:
	libavcodec/Makefile
	libavcodec/pthread.c
	libavcodec/vp8.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 13:01:41 +02:00
Anton Khirnov
90f9a5830b w32pthreads: move from lavc to compat/
It will be used in other places than lavc.
2013-05-24 09:26:54 +02:00
Stefano Sabatini
90cb081f88 build: drop unused ALLMANPAGES variable 2013-05-19 19:26:21 +02:00
Michael Niedermayer
84bfa8beb7 Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640'
* commit 'a862c7d3368241e72a465ab944afa38ea62a6640':
  Integrate lcov/gcov into Libav

Conflicts:
	Makefile
	common.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-06 13:23:38 +02:00
Reinhard Tartler
a862c7d336 Integrate lcov/gcov into Libav
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/
2013-04-05 18:55:11 +02:00
Michael Niedermayer
2b6185cac9 Merge commit 'b4d24b471bc52f1f78a43ee330199e70483e51c3'
* 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>
2013-03-28 12:07:38 +01:00
Diego Biurrun
b4d24b471b build: Remove configure-generated .config file on distclean 2013-03-27 14:49:13 +01:00