1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Commit Graph

3818 Commits

Author SHA1 Message Date
Michael Niedermayer
21e40f006a Merge commit '876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de'
* commit '876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de':
  configure: don't enable tls protocols if network is disabled

Conflicts:
	configure

See: 7fc6545d5d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-02 22:50:19 +02:00
Michael Niedermayer
b0af4043b9 configure: Remove now redundant vsx setting code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-02 22:14:41 +02:00
James Almer
876d441fbe configure: don't enable tls protocols if network is disabled
This was a regression introduced with d8ffb2055f.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-06-02 22:48:50 +03:00
Michael Niedermayer
d5db4a7c23 configure: Do not dump the whole environment to stdout
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-02 19:53:17 +02:00
Michael Niedermayer
2a33972030 Merge commit 'fd11465b21ac90bf6964b0c0ca9d6ba64cd3291d'
* commit 'fd11465b21ac90bf6964b0c0ca9d6ba64cd3291d':
  configure: Use pkg-config for fdk-aac

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-02 19:31:22 +02:00
Michael Niedermayer
f939bf58b2 Merge commit '604abd025dac4cc73a2f6b0c000c3695c16fb000'
* commit '604abd025dac4cc73a2f6b0c000c3695c16fb000':
  configure: Provide an option to override the environment

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-02 19:03:02 +02:00
Michael Niedermayer
cec3456254 Merge commit '06db45523c1068c24f049ef2b20fcdead3bf36d8'
* commit '06db45523c1068c24f049ef2b20fcdead3bf36d8':
  configure: Support the extended pkgconf syntax

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-02 18:54:57 +02:00
Luca Barbato
fd11465b21 configure: Use pkg-config for fdk-aac
Makes the life of the people already setting PKG_CONFIG_PATH simpler.
2015-06-02 10:33:32 +02:00
Luca Barbato
604abd025d configure: Provide an option to override the environment
Useful to have `make config` work with custom pkgconf path.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-06-02 10:33:11 +02:00
Luca Barbato
06db45523c configure: Support the extended pkgconf syntax
Make possible to require a combination of
packages and/or pin specific versions.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-06-02 10:33:11 +02:00
Michael Niedermayer
da05c62499 Merge commit '8349bedfa5eac7f261ac43053a2f66b894bac288'
* commit '8349bedfa5eac7f261ac43053a2f66b894bac288':
  configure: Remove some unnecessary exported config items

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-01 23:08:33 +02:00
Michael Niedermayer
9ac3417c6b Merge commit 'ff7ae4b9df6e89d99dbd5434408123b80a4f6cd7'
* commit 'ff7ae4b9df6e89d99dbd5434408123b80a4f6cd7':
  configure: Require LPDIRECT3DSURFACE9 for dxva2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-01 23:08:12 +02:00
James Almer
7fc6545d5d configure: don't enable any tls protocol if network is disabled
This was a regression introduced with 4a006b9eb7.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-06-01 17:49:21 -03:00
Martin Storsjö
8349bedfa5 configure: Remove some unnecessary exported config items
The only need to be listed if they are to be used in ifdefs from
within the code - config items used as dependencies only within
configure don't need to be exported.

Signed-off-by: Martin Storsjö <martin@martin.st>
2015-06-01 23:04:52 +03:00
Martin Storsjö
ff7ae4b9df configure: Require LPDIRECT3DSURFACE9 for dxva2
This fixes dxva2 detection (i.e. correctly realizes that it isn't
available) for WinRT, where dxva2api.h does exist, but these definitions
are omitted (when targeting the API subsets).

Ideally we should rather check for e.g. DXVA2_ConfigPictureDecode,
but configure might fail to find that definition due to _WIN32_WINNT
not being set to the right value during configure. (libavcodec/dxva2.h
manually overrides the _WIN32_WINNT define.)

This allows removing hardcoded --disable-dxva2 from such build
configurations.

Signed-off-by: Martin Storsjö <martin@martin.st>
2015-06-01 23:04:49 +03:00
Michael Niedermayer
589d39c768 Merge commit '63ce9fd23cfa5ac0d9a862be0da138108dc1c505'
* commit '63ce9fd23cfa5ac0d9a862be0da138108dc1c505':
  rtmpdh: Use GMP functions directly, instead of nettle wrappers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-01 11:29:05 +02:00
Steve Lhomme
31de41babc configure: Check if ID3D11VideoDecoder exists, not just the header to enable d3d11va
Fixes build with some mingw-w64 versions, that have got the header
but not the interface declaration.

Signed-off-by: Martin Storsjö <martin@martin.st>
2015-06-01 12:04:46 +03:00
Martin Storsjö
63ce9fd23c rtmpdh: Use GMP functions directly, instead of nettle wrappers
mpz_import and mpz_export were added in GMP 4.1, in 2002.

This simplifies the DH code by clarifying that it only uses pure
bignum functions, no other parts of nettle/hogweed.

Signed-off-by: Martin Storsjö <martin@martin.st>
2015-06-01 10:38:54 +03:00
James Almer
f10497042f nvenc: remove cuda.h requirement for nvenc_a
Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-06-01 01:33:47 -03:00
Michael Niedermayer
d8bbb99c51 Merge commit 'b08caa87c35a768ec0abb16b1e99c3a85f1df28e'
* commit 'b08caa87c35a768ec0abb16b1e99c3a85f1df28e':
  nvenc: H264 and HEVC encoders

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/version.h

This implementation is merged under the name nvenc_b*

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-01 03:13:55 +02:00
Michael Niedermayer
1aff90504a configure: ldbrx seems not working on qemu power8, disable for now
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-31 23:12:57 +02:00
Michael Niedermayer
3f21cdd85b Merge commit 'f22ebd2555d15b59e109a5b630dd71374b076d0b'
* commit 'f22ebd2555d15b59e109a5b630dd71374b076d0b':
  ppc: configure: Support ISA 2.06 and later

Conflicts:
	configure

See: ab12373956 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-31 22:41:04 +02:00
Luca Barbato
b08caa87c3 nvenc: H264 and HEVC encoders
Partially based on the work of Timo Rothenpieler <timo@rothenpieler.org>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-05-31 15:17:22 +02:00
Luca Barbato
f22ebd2555 ppc: configure: Support ISA 2.06 and later
POWER 7 and POWER 8 support VSX and ldbrx.

POWER 8 supports additional extended VSX instructions introduced
with ISA 2.07.
2015-05-31 12:07:10 +02:00
Rodger Combs
c729021f45 configure: Check for SecItemImport for securetransport as well
This fixes the default build on iOS; eventually I should come up with
a better solution for that platform.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-31 12:02:53 +02:00
Rodger Combs
f24d92bada lavf/tls: Support Secure Transport
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-29 21:52:27 +02:00
Michael Niedermayer
bedb5d587b configure: Fix showcqt fft dependancy
Found-by: Muhammad Faiz <mfcc64@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-29 21:30:17 +02:00
Ingo Brückl
083b1a32d5 build: add configure option pkgconfigdir
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-05-29 20:36:10 +02:00
wm4
4a006b9eb7 lavf: split tls.c
Move the OpenSSL and GnuTLS implementations to their own files. Other
than the connection code (including options) and some boilerplate, no
code is actually shared.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-27 21:48:47 +02:00
wm4
d8ffb2055f lavf: split tls.c
Move the OpenSSL and GnuTLS implementations to their own files. Other
than the connection code (including options) and some boilerplate, no
code is actually shared.

Signed-off-by: Martin Storsjö <martin@martin.st>
2015-05-26 21:48:32 +03:00
Michael Niedermayer
a838b22bd9 configure: Check if ID3D11VideoDecoder exists, not just the header to enable d3d11va
Fixes build with "mingw-w64-x86-64-dev 3.2.0-2"

Tested-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-26 01:51:33 +02:00
Michael Niedermayer
3232ac4bac configure: d3d11va is auto-detected like the others
Fix the help text accordingly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-25 23:45:13 +02:00
Michael Niedermayer
947b74ee7d Merge commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772'
* commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772':
  D3D11va: add a Direct3D11 video decoder similar to DXVA2

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/dxva2_vc1.c
	libavcodec/version.h
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-25 22:24:34 +02:00
Steve Lhomme
d8039ef8d2 D3D11va: add a Direct3D11 video decoder similar to DXVA2
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-05-25 11:47:08 +02:00
James Almer
57d9788d1b configure: simplify libwebp checks
The libwebpmux pkg-config file already has an explicit dependecy on libwebp >= 0.2.0.
Also remove the warning and silently disable the anim encoder when libwebpmux is not new enough.
This is more in line with other library components, like libvpx-vp9

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-05-23 14:18:54 -03:00
James Almer
98be2d94ea libwebp: remove unneeded defines
Signed-off-by: James Almer <jamrial@gmail.com>
2015-05-23 01:29:23 -03:00
Urvang Joshi
02cf59f3a6 WebP encoder: use WebPAnimEncoder API when available.
WebPAnimEncoder API is a combination of encoder (WebPEncoder) and muxer
(WebPMux). It performs several optimizations to make it more efficient
than the combination of WebPEncode() and native ffmpeg muxer.

When WebPAnimEncoder API is used:
- In the encoder layer: we use WebPAnimEncoderAdd() instead of
  WebPEncode().
- The muxer layer: works like a raw muxer.

On the other hand, when WebPAnimEncoder API isn't available, the old code is
used as it is:
- In the codec layer: WebPEncode is used to encode each frame
- In the muxer layer:  ffmpeg muxer is used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-23 03:31:28 +02:00
周晓勇
f9d05786a8 configure: add cpuflags for loongson3 series cpu
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-20 17:57:59 +02:00
周晓勇
0d41f1ffbc configure: disable mipsfpu for loongson3
MIPSFPU optimization does't support FATE correctly on Loongson-3.

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-20 12:24:59 +02:00
Gopu Govindaswamy
3b5e5e6a29 libx265: Use the Multi-library Interface
Use the Multi-library interface to load at runtime x265 libraries
supporting alternative bit depths (e.g. 8bit and 16bit).

The linked library will try to load the library supporting the
pixel format if it is not supported by itself.

Fallback requesting the native library (passing 0 to x265_api_get) if
a library supporting the requested bit depth is not available.

Signed-off-by: Gopu Govindaswamy <gopu@multicorewareinc.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-05-13 17:14:50 +02:00
周晓勇
ce95c14cd4 configure: disabled -mips64 option for loongson and remove redundant cpuflags
1.Option -march=loongson3a conflicts with -mips64 or -mips64r2.
2.Option -mhard-float has been removed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-13 11:34:59 +02:00
Gopu Govindaswamy
94c20de429 avcodec/libx265: use x265 Multi-library Interface to query the API
ffmpeg can now use the x265 multi-library interface to make a runtime
selection between a number of libx265 libraries (perhaps 8bpp and 16bpp).

ffmpeg will link to one build of libx265 (statically or
dynamically) and this linked version of libx265 will support one
bit-depth (8 or 10 bits). At runtime, ffmpeg now has the option to request the
encoder to use a different bit depth(8 or 10). If the requested bitdepth
is zero, or if it matches the bitdepth of the system default libx265 (the
currently linked library), then this library will be used for encode.
If ffmpeg requests a different bit-depth, the linked libx265 will attempt
to dynamically bind a shared library with the requested bit-depth from the install
location (default or user-specified).

new x265 API:
     const x265_api* api = x265_api_get(int bitDepth);
     x265_api - holds the libx265 public API functions
     bitDepth - requested API for 8bpp or 16bpp

     note: Use 0 to indicate native bit depth of the linked libx265 and
           x265_api_get(0) is guaranteed to return a non-null pointer

Signed-off-by: Gopu Govindaswamy <gopu@multicorewareinc.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2015-05-11 16:15:23 +01:00
周晓勇
ba1f56ae9b configure: remove loongson check inline asm and mips dependent
1.Loongson now have two series CPU supported MMI(Multi-Media Instruct).
  Loongson-3 designed multi-core have good performance in decoding.
  Loongson-2's support is comming soon.
2.Replaced loongson with loongson2 and loongson3.

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-08 14:33:40 +02:00
周晓勇
b6d8afd820 configure: replace arch loongson with arch extra list loongson
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-08 14:01:38 +02:00
Dave Yeo
22a0387df2 OS/2:Makedef.cmd cleanup
Remove PROTMODE as it doesn't make sense for DLLs. Also fixes a warning with the OpenWatcom linker
Export symbols as names rather then ordinals for better compatibility for minor releases.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-06 11:37:26 +02:00
Michael Niedermayer
c8b4ffdf55 configure: prepend avfilter_deps for *_rect filters
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-03 01:42:51 +02:00
Michael Niedermayer
40964e2e89 Merge commit '3edeb7749e4276c78ad57307b8c3b32dd476d1da'
* commit '3edeb7749e4276c78ad57307b8c3b32dd476d1da':
  configure: Allow log2 with MSVC 2013 onwards.

Conflicts:
	configure

See: 4d93e758d7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-03 01:30:53 +02:00
Michael Niedermayer
02b5af7744 Merge commit '863ee06809b215895ee20cbc557eeceb904cf770'
* commit '863ee06809b215895ee20cbc557eeceb904cf770':
  configure: Use the right local variable in the MSVC and ICL probes

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-03 01:20:24 +02:00
Michael Niedermayer
94f4bdc4f1 configure: add forgotten avcodec/avformat deps for find/cover_rect
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02 21:28:31 +02:00
Michael Niedermayer
61b4ab1860 avfilter: Add cover_rect filter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02 21:15:48 +02:00