virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
60,945 Commits 37 Branches 400 Tags 460 MiB
3ba056017f
Commit Graph

3268 Commits

Author SHA1 Message Date
Timothy Gu
baa650cc79 configure: use pkg-config to detect libbluray 
The current configure fails when static libbluray is compiled with libxml2
support.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 18:57:43 +01:00
Michael Niedermayer
1f2bacc897 Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a' 
* commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a':
  libavfilter: example audio filtering program

Conflicts:
	.gitignore
	configure
	doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-25 20:26:00 +01:00
Anton Khirnov
e7dfaf16a4 libavfilter: example audio filtering program 
Based on a patch by Andrew Kelley <superjoe30@gmail.com>

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-02-25 13:22:10 +01:00
Derek Buitenhuis
d373647194 libx265: Update API usage 
Framerate is now a sane rational instead of an integer, and
inputDepth is changed to what it actually is.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-24 11:09:30 -05:00
Derek Buitenhuis
d00a504b24 libx265: Update API usage 
Framerate is now a sane rational instead of an integer, and
inputDepth is changed to what it actually is.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-24 15:50:04 +00:00
Michael Niedermayer
38336f0fb1 Merge commit '5800ba0db667630e6ff81d30f03961ea10726aa6' 
* commit '5800ba0db667630e6ff81d30f03961ea10726aa6':
  configure: disable cpunop if the check fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-23 22:25:13 +01:00
Diego Biurrun
96ea3dea58 configure: Move cpunop into ARCH_EXT_LIST_X86 
It is a processor feature, so it belongs there.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-23 22:24:51 +01:00
James Almer
1b932eb150 x86: add detection for FMA3 instruction set 
Based on x264 code

Signed-off-by: James Almer <jamrial@gmail.com>
 2014-02-23 15:29:36 +01:00
James Almer
10b0161d78 x86: add missing XOP checks and macros 
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-02-23 15:29:36 +01:00
Janne Grunau
5800ba0db6 configure: disable cpunop if the check fails 
Moving cpunop from the HAVE_LIST to the ARCH_EXT_LIST_X86 has the side
effect of enabling it. The semantics of the check have to be changed
from enable if successful to disable if unsuccessful. This was missing
in 2b0bb69997 causing build errors with
nasm.
 2014-02-23 15:29:20 +01:00
Dave Yeo
e5858fef38 configure: Revert commit 5176e9651b 
This fixes cpunop detection and unbreaks NASM assembly

Signed-off-by: Dave Yeo <daveryeo@telus.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-23 01:34:05 +01:00
James Almer
a2af8eddab x86: add detection for FMA3 instruction set 
Based on x264 code

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-22 17:25:52 +01:00
Michael Niedermayer
9026c49c82 Merge commit 'd6a27f885b5d4cba7a82e50af423c741d2f37c3e' 
* commit 'd6a27f885b5d4cba7a82e50af423c741d2f37c3e':
  configure: Add usan to the toolchain presets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-20 23:39:49 +01:00
Michael Niedermayer
5176e9651b Merge commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0' 
* commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0':
  configure: Move cpunop into ARCH_EXT_LIST_X86

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-20 23:27:13 +01:00
Michael Niedermayer
36eec03211 Merge commit '6adf4290ebcf65ac8243d74f34ba0a508f561633' 
* commit '6adf4290ebcf65ac8243d74f34ba0a508f561633':
  configure: Move inet_aton check into network function check block

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-20 23:18:11 +01:00
Luca Barbato
d6a27f885b configure: Add usan to the toolchain presets 
clang-3.4 and gcc-4.9 have it.
 2014-02-20 18:58:38 +01:00
Diego Biurrun
2b0bb69997 configure: Move cpunop into ARCH_EXT_LIST_X86 
It is a processor feature, so it belongs there.
 2014-02-20 18:20:08 +01:00
Diego Biurrun
6adf4290eb configure: Move inet_aton check into network function check block 2014-02-20 18:20:07 +01:00
Michael Niedermayer
fdba564585 Merge commit '192ccc5034ad4ac1b5022fc16c1162267add6a0f' 
* commit '192ccc5034ad4ac1b5022fc16c1162267add6a0f':
  build: The MPEG-4 video parser depends on h263dsp

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-20 14:39:33 +01:00
Diego Biurrun
192ccc5034 build: The MPEG-4 video parser depends on h263dsp 
The dependency is indirect through the h263/mpegvideo code.
CC: libav-stable@libav.org
 2014-02-20 11:55:12 +01:00
Michael Niedermayer
0a30ad3473 Merge commit '874c751cc5b99cd68932e21c2c3a0d21134207e0' 
* commit '874c751cc5b99cd68932e21c2c3a0d21134207e0':
  threads: Check w32threads dependencies at the configure stage

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-19 21:53:58 +01:00
Carl Eugen Hoyos
9c070ae03e Fix dctdnoiz dependencies, the filter should select dct, not fft. 
Fixes compilation with --disable-everything --enable-filter=dctdnoiz
 2014-02-19 17:27:36 +01:00
Diego Biurrun
874c751cc5 threads: Check w32threads dependencies at the configure stage 
Also add warning comment about threading implementations without matching
atomics implementation to the atomics fallback implementation.
 2014-02-19 15:12:37 +01:00
Michael Niedermayer
1fc74926a5 Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 
* 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-17 02:22:01 +01:00
Diego Biurrun
b339182eba Move all example programs to doc/examples 
Also drop support for building examples in library directories.
 2014-02-16 21:37:21 +01:00
Michael Niedermayer
8dc5a46466 Merge commit 'd261719319a505e1716e8b52fc955bef0503ff96' 
* commit 'd261719319a505e1716e8b52fc955bef0503ff96':
  configure: do not link libraries against program-specific dependencies

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 02:45:45 +01:00
Michael Niedermayer
fd982f2b40 Merge commit '60e6cecf9bc7d6a238e6b316da52edcc6d1ef7f8' 
* commit '60e6cecf9bc7d6a238e6b316da52edcc6d1ef7f8':
  configure: avserver does not need $ldl

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 02:10:15 +01:00
Janne Grunau
d261719319 configure: do not link libraries against program-specific dependencies 
Bug-Id: 635
 2014-02-13 13:01:49 +01:00
Janne Grunau
60e6cecf9b configure: avserver does not need $ldl 
Loadable plugins were removed in d010e95f86.
 2014-02-13 00:29:14 +01:00
Derek Buitenhuis
50ea93158d Add libx265 encoder 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-12 13:13:17 +00:00
Derek Buitenhuis
bb6b1731eb Add libx265 encoder 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-12 13:12:22 +00:00
James Almer
6c12b1de06 x86: add missing XOP checks and macros 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-11 03:46:52 +01:00
Ramiro Polla
5965adeb20 lavd: add decklink output device 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 17:15:19 +01:00
Michael Niedermayer
0c4bf87b29 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Mirillis FIC video decoder

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 19:02:46 +01:00
Michael Niedermayer
3a0e4f6c90 Merge commit '6398d8fd813490fc3900baf8c788f803d8e17b73' 
* commit '6398d8fd813490fc3900baf8c788f803d8e17b73':
  configure: clang: add -Qunused-arguments to as|ld_flags as well

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 17:15:36 +01:00
Kostya Shishkov
cde7df25ef Mirillis FIC video decoder 
Does not contain cursor rendering yet.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-08 15:04:13 +00:00
Janne Grunau
6398d8fd81 configure: clang: add -Qunused-arguments to as|ld_flags as well 2014-02-08 13:38:36 +01:00
Peter Krefting
d5733936d8 configure: Remove dcbzl check for e500v1 and e500v2 architectures 
The DCBZL instruction is not available for the e500v1 and e500v2
architectures, but may still be recognized by the toolchain, so we need to
remove the test for it explicitly for these architectures.

References: PowerPC™ e500 Core Family Reference Manual (Freescale)

Found-by: Ståle Kristoffersen <staalebk@ifi.uio.no>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-06 22:31:43 +01:00
Timothy Gu
4a37e2977c libfdk-aacenc: disable hard version requirements 
Enable compilation on machines with an old libfdk-aac.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-06 02:33:33 +01:00
Timothy Gu
9a4a559d6f configure: use real libfdk-aac version instead of API version in help text 
Also use real name with a '-' instead of '_'.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-05 16:06:20 +01:00
Stefano Sabatini
5fc4dea39c examples: add avio_reading.c example 2014-02-02 11:58:23 +01:00
Carl Eugen Hoyos
3f35a31ee9 Add rangecoder to the sonic dependencies in configure. 
Fixes compilation with --disable-everything --enable-decoder=sonic
and --disable-everything --enable-encoder=sonic.
 2014-01-30 12:15:28 +01:00
Carl Eugen Hoyos
862174ec83 Move GUID-related objects to riffenc.c and riff.c. 
This simplifies the following eac3-in-wav patch.
 2014-01-29 00:44:59 +01:00
Lukasz Marek
ded6b3af41 lavd: add opengl device 
It can render to OpenGL context provided by application or into SDL window

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-01-27 15:18:18 +01:00
Stefano Sabatini
37baa2af43 configure: add missing dependency for the remuxing example 2014-01-26 18:31:03 +01:00
Jean First
91489d28ba avcodec/libfdk_aacenc: enable 7.1 channel encoding 
7.1(wide) and 7.1(wide-side) channel layouts are supported in fdk_aac since october 2013 (commit fa3eba1644)

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-26 03:31:42 +01:00
Michael Niedermayer
c46faacdf4 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: clang: explicitly state dep file and rule name in DEPFLAGS

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-26 03:23:51 +01:00
Michael Niedermayer
0e2dd05c22 Merge commit 'fb87e69ff77f96536768dbae01d82db70c8b41f3' 
* commit 'fb87e69ff77f96536768dbae01d82db70c8b41f3':
  configure: add missing x86 dependency for i686

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-26 03:19:38 +01:00
Janne Grunau
9e057f53aa configure: clang: explicitly state dep file and rule name in DEPFLAGS 
Fixes dependency file generation with gas-preprocessor.pl and clang.
Flags copied from GCC and tested with Apple's clang from Xcode 5 and
5.1 and clang 3.2, 3.3, 3.4 on Linux.
 2014-01-25 21:50:21 +01:00
Janne Grunau
fb87e69ff7 configure: add missing x86 dependency for i686 2014-01-25 21:50:20 +01:00