virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
55,506 Commits 37 Branches 400 Tags 460 MiB
e87fcaa8d5
Commit Graph

3030 Commits

Author SHA1 Message Date
Michael Niedermayer
69ea65b46f Merge commit '3e5898782dce60334ab294821ca00b19c648cf66' 
* commit '3e5898782dce60334ab294821ca00b19c648cf66':
  Voxware MetaSound decoder

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-08 12:11:33 +02:00
Kostya Shishkov
3e5898782d Voxware MetaSound decoder 2013-08-08 10:52:44 +02:00
Stephen Hutchinson
7f43a09da7 configure: Add -lstdc++ to the requirements for linking with libgme. 
Needed for cross-compiling with MinGW-w64

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-07 11:13:40 +02:00
Michael Niedermayer
66328da700 Merge commit '6fb65973c9501d3fe94a5a9195c01cd20083066e' 
* commit '6fb65973c9501d3fe94a5a9195c01cd20083066e':
  configure: Properly split dv1394 indev dependencies

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 19:33:46 +02:00
Michael Niedermayer
c32db6adab Merge commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7' 
* commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7':
  configure: Properly set zlib dependencies for all components

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 19:29:27 +02:00
Michael Niedermayer
05f1b4e2ec Merge commit 'a7d45e06e9757f49ea4e105cbefc3462a7324e9a' 
* commit 'a7d45e06e9757f49ea4e105cbefc3462a7324e9a':
  configure: The W64 demuxer should select the WAV demuxer, not depend on it

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 19:22:00 +02:00
Michael Niedermayer
1faece7ecc Merge commit '406e6c0ba5393fa302080202fe77bd09187889a1' 
* commit '406e6c0ba5393fa302080202fe77bd09187889a1':
  configure: Properly split avserver component and system dependencies

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 19:04:04 +02:00
Michael Niedermayer
0a8f5eb23a Merge commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b' 
* commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b':
  riff: Move demuxing code to a separate file.

Conflicts:
	configure
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 18:30:47 +02:00
Michael Niedermayer
508a5349da Merge commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472' 
* commit '3dd5c95deef51d7fbf6f4458ba42d1335d2f1472':
  riff: Move muxing code to a separate file

Conflicts:
	configure
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 18:08:30 +02:00
Michael Niedermayer
8d06ce7941 Merge commit '605387582bd35920b83a26dabbe1c0601f425621' 
* commit '605387582bd35920b83a26dabbe1c0601f425621':
  lavf: Support unix sockets

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 15:33:12 +02:00
Michael Niedermayer
bf36dc50ea Merge commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8' 
* commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8':
  vdpau: remove old-style decoders

Conflicts:
	libavcodec/allcodecs.c
	libavcodec/h263dec.c
	libavcodec/h264.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg4videodec.c
	libavcodec/vc1dec.c
	libavcodec/vdpau.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 13:24:22 +02:00
Diego Biurrun
6fb65973c9 configure: Properly split dv1394 indev dependencies 2013-08-06 11:23:00 +02:00
Diego Biurrun
61c31e4ee7 configure: Properly set zlib dependencies for all components 2013-08-06 11:23:00 +02:00
Diego Biurrun
a7d45e06e9 configure: The W64 demuxer should select the WAV demuxer, not depend on it 2013-08-06 11:23:00 +02:00
Diego Biurrun
406e6c0ba5 configure: Properly split avserver component and system dependencies 2013-08-06 11:23:00 +02:00
Diego Biurrun
255d9c570e riff: Move demuxing code to a separate file. 2013-08-06 11:02:36 +02:00
Diego Biurrun
3dd5c95dee riff: Move muxing code to a separate file 2013-08-06 11:02:35 +02:00
Luca Barbato
605387582b lavf: Support unix sockets 2013-08-05 16:13:35 +02:00
Rémi Denis-Courmont
578ea75a9e vdpau: remove old-style decoders 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-05 11:15:49 +02:00
Diego Biurrun
038c4f65ee configure: Check for GCC diagnostic pragma support inside of functions 
The actual usage of the pragma is within functions and older versions
of gcc only support the pragma outside of functions.
 2013-08-03 10:08:04 +02:00
Michael Niedermayer
85fc1a18ca Merge commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b' 
* commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b':
  build: Add _Pragma macro to disable deprecated declaration warnings

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 09:27:37 +02:00
Carl Eugen Hoyos
401f6a7126 Do not suggest to use gas-preprocessor if using it would break compilation. 
gas-preprocessor does not work on ppc with pic and on ppc64.
 2013-08-02 23:23:58 +02:00
Diego Biurrun
6da5b57da1 configure: Check for GCC diagnostic pragma support inside of functions 
The actual usage of the pragma is within functions and older versions
of gcc only support the pragma outside of functions.
 2013-08-02 22:34:03 +02:00
Diego Biurrun
3a7050ffed build: Add _Pragma macro to disable deprecated declaration warnings 2013-08-02 19:19:02 +02:00
Romain Beauxis
38536e5927 Support for shine 3.0.0 2013-07-30 21:12:34 +00:00
Michael Niedermayer
5fae467894 Merge commit '4822ee3ca620a92cd2b0a9a03ea9e34288192c79' 
* commit '4822ee3ca620a92cd2b0a9a03ea9e34288192c79':
  configure: Detect AIX ar command instead of hardcoding it in the OS section

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-30 11:20:12 +02:00
Diego Biurrun
4822ee3ca6 configure: Detect AIX ar command instead of hardcoding it in the OS section 2013-07-29 19:43:37 +02:00
Michael Niedermayer
e64dc86a13 Merge commit '80ade7985cd95156e2156f50adc7b86d0e43a07a' 
* commit '80ade7985cd95156e2156f50adc7b86d0e43a07a':
  AIX: add support for shared builds

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-27 09:13:07 +02:00
Michael Kostylev
80ade7985c AIX: add support for shared builds 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-07-26 21:12:36 +02:00
Michael Niedermayer
46ad2d9e44 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  miscellaneous typo fixes

Conflicts:
	configure
	libavformat/avisynth.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-26 11:12:11 +02:00
Diego Biurrun
03039f4c8c miscellaneous typo fixes 2013-07-25 19:43:32 +02:00
Carl Eugen Hoyos
8ca3766f00 Allow native compilation on the iPhone. 2013-07-25 19:08:19 +02:00
Michael Niedermayer
2ca6a13b52 Merge commit '7ef760d95c73dfee021b8fdee04f65126eb7edd1' 
* commit '7ef760d95c73dfee021b8fdee04f65126eb7edd1':
  configure: generate full msvc debug symbols when linking in debug mode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-22 10:34:48 +02:00
Hendrik Leppkes
7ef760d95c configure: generate full msvc debug symbols when linking in debug mode 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-21 19:59:15 +03:00
Michael Niedermayer
8740762c43 Merge commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4' 
* commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4':
  avserver: Remove unused loadable module support

Conflicts:
	configure
	ffserver.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-19 10:26:07 +02:00
Martin Storsjö
d010e95f86 avserver: Remove unused loadable module support 
There is no record of this ever being used at all, anywhere,
since the feature was added in 2effd27446.

This gets rid of extra linker tricks just to support a feature
that isn't used, simplifying portability to other platforms.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-18 17:25:49 +03:00
Paul B Mahol
80c6445932 lavfi: port perspective filter from libmpcodecs 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-14 16:27:17 +00:00
Carl Eugen Hoyos
289737c8be configure: Disable avresample if an old version of yasm is used. 
The avresample maintainers decided not to support old versions of yasm.
Supporting old yasm in FFmpeg was no big effort in the last months,
so keep it for the time being.
 2013-07-13 17:16:44 +02:00
Carl Eugen Hoyos
149def7781 configure: Only build ffserver if SA_RESAMPLE is available. 
QNX does not define SA_RESAMPLE (because it is not implemented).
Fixes ticket #2780.

Reviewed-by: Nicolas George
 2013-07-13 17:16:30 +02:00
Michael Niedermayer
c6953589f9 Merge commit 'ef5b70affc6376bfeadd1ff649b79bad9a124fa8' 
* commit 'ef5b70affc6376bfeadd1ff649b79bad9a124fa8':
  configure: Check for support for labels in the inline assembly

The timer code is not placed under ifdef as ours does not use labels

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-12 12:07:14 +02:00
Martin Storsjö
ef5b70affc configure: Check for support for labels in the inline assembly 
Use this for enabling the ppc timer.h implementation only on
assemblers that support labels in the inline assembly.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-07-11 18:53:02 +03:00
Michael Niedermayer
47ca9f041c Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  compat: wrap math.h to avoid AIX-specific clashes

Conflicts:
	configure

See: bf18abb2eb, 0915b531bc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-05 13:11:06 +02:00
Paul B Mahol
35b02732b9 configure: fix webp decoder dependency 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-07-04 20:41:54 +00:00
Luca Barbato
d3635f3ab0 compat: wrap math.h to avoid AIX-specific clashes 
AIX defines a class() function in its math.h header without any
guard.
 2013-07-04 21:54:32 +02:00
Stefano Sabatini
5efbeae38c configure: rename have_incompatible_fork_abi -> have_incompatible_libav_abi 
"Fork" is an ambiguous term, since there may be more than one fork, also
"fork" could be confused with the corresponding function. Also it seems
important to point the name of the referenced fork in the symbol.

Note: the old --enable-incompatible-fork-abi command is retained for
compatibility, although it should be considered deprecated.
 2013-07-03 13:16:33 +02:00
Michael Niedermayer
ffed7227c3 Revert "doc: add script to compute texi files dependencies" 
This reverts commit 628ceac652.

The commit broke out of tree builds
 2013-07-03 12:59:59 +02:00
Stefano Sabatini
628ceac652 doc: add script to compute texi files dependencies 
Replace the inline awk script with a Perl script which tracks the
dependencies recursively.

This allows to correctly track dependencies for files including files
with a second level include (for example: ffmpeg-devices.texi ->
devices.texi -> outdevs.texi).

This also adds a dependency on perl for computing the dependencies, which
should not be a problem since perl is already required all the way for
building documentation.
 2013-07-03 11:25:45 +02:00
wm4
c3316ddb83 lavf: add support for libgme 
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-02 18:52:45 +02:00
Carl Eugen Hoyos
f803e0dc0e Support compilation on aix with gcc. 
Shared libraries and the IBM compiler are currently not supported.
"--arch=ppc" has to be passed to configure, uname is not compatible.
 2013-06-30 13:47:45 +02:00
Carl Eugen Hoyos
2bccd82c29 Do not list libshine like a main option in configure's output. 
It is listed as an enabled external library if applicable.
 2013-06-28 16:23:39 +02:00