1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Commit Graph

1764 Commits

Author SHA1 Message Date
Michael Niedermayer
c0b1bc8d17 Revert "partially rename FFmpeg to Libav"
This reverts commit 070c5d0f35.
2011-03-17 17:26:45 +01:00
Michael Niedermayer
e528cdac8a Revert "replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION"
This reverts commit 29ba091136.
2011-03-17 17:26:45 +01:00
Michael Niedermayer
0cb88628fb Revert "use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*"
This reverts commit a03be6e1ba.
2011-03-17 17:26:45 +01:00
Michael Niedermayer
0fecf2642b Merge remote-tracking branch 'newdev/master'
Conflicts:
	Changelog
	doc/APIchanges
	doc/optimization.txt
	libavformat/avio.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-17 17:22:52 +01:00
Sean McGovern
dff68563d8 darwin: use -read_only_relocs flag only on 32-bit x86
Avoids the linker warning:
ld: warning: -read_only_relocs cannot be used with x86_64

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-16 23:18:27 +00:00
Janne Grunau
a03be6e1ba use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_* 2011-03-16 21:54:39 +01:00
Janne Grunau
29ba091136 replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION
also update the multiple inclusion guards in config.h|mak
2011-03-16 21:54:39 +01:00
Janne Grunau
070c5d0f35 partially rename FFmpeg to Libav
update mailing list references and irc channels in configure
2011-03-16 21:54:39 +01:00
Michael Niedermayer
fbe98aee20 Revert "configure: allow checking multiple functions in check_func_headers()"
This reverts commit edaf1ae276.

breaks windows builds
2011-03-12 19:14:55 +01:00
Michael Niedermayer
8876c8ae24 Revert "configure: improve pkg-config support"
This reverts commit 3f8040db3e.

breaks windows builds
2011-03-12 19:14:49 +01:00
Michael Niedermayer
a0a1b7b90d Revert "configure: use pkg-config helpers"
This reverts commit 4fa18c5666.

breaks windows builds
2011-03-12 19:14:25 +01:00
Michael Niedermayer
27efa296c2 Merge branch 'master' of git://git.ffmpeg.org/ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-12 17:55:59 +01:00
Mans Rullgard
a5444fee06 Add CONFIG_AC3DSP symbol to simplify makefiles
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-12 11:35:26 +00:00
Mans Rullgard
4fa18c5666 configure: use pkg-config helpers
This makes existing pkg-config uses as well as the libsdl checks
use the new pkg-config helper functions, which should be more
robust against broken systems.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-11 20:13:32 +00:00
Mans Rullgard
3f8040db3e configure: improve pkg-config support
This adds helper functions for checking packages with pkg-config
and managing the associated flags.

Note that pkg-config use is still discouraged due to widespread
poor practices resulting in broken flags in many situations.  A
few badly designed packages require flags only obtainable using
pkg-config, and these functions are intended for those cases.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-11 20:13:26 +00:00
Mans Rullgard
edaf1ae276 configure: allow checking multiple functions in check_func_headers()
This makes it possible to pass a space-separated list of functions
to check_func_headers and check_lib2.  If any function is missing,
none are enabled as available, so this should only be used for
all-or-nothing sets, i.e. groups in which none will be used if any
one is missing.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-11 20:13:22 +00:00
Philip Langdale
b33fa8a1cd CrystalHD decoder support v7
The Broadcom CrystalHD decoder chips provide hardware video
decoding for a number of video formats. It does so using a
memory:memory interface where a compressed bitstream is fed
in and decompressed pictures are copied out. As such, it works
independent of any graphics hardware in the system.

Features supported in this initial version:
* Support for Linux (using current drivers/library from git.wilsonet.com)
* Support for 70015 hardware
* Formats: MPEG2, MPEG4 Part 2, H.264, VC1 and DivX 3.11 (untested)
* Progressive content
* Non-H.264 Interlaced content
* H.264 MBAFF content

Features missing in this initial version:
* Support for OSX (might work - untested)
* Support for Windows
* Support for 70012 hardware
* H.264 PAFF content

Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-10 20:17:19 +01:00
Stefano Sabatini
1a204f0760 framebuffer device demuxer 2011-03-08 17:33:23 +01:00
Mans Rullgard
42ccd2fcf8 Use --sysroot flag for clang
Although not documented, clang does support the --sysroot flag, and it
does the right thing.  Use this flag intead of -isysroot which only
applies to header file searches, not the linker.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 00ba041cb3)
2011-03-01 13:55:54 +01:00
Mans Rullgard
00ba041cb3 Use --sysroot flag for clang
Although not documented, clang does support the --sysroot flag, and it
does the right thing.  Use this flag intead of -isysroot which only
applies to header file searches, not the linker.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-28 02:55:50 +00:00
Reimar Döffinger
bbd289aa18 configure: document FATE_SAMPLES env var in --help text
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 52b3cc6047)
2011-02-28 00:34:38 +01:00
Mans Rullgard
1a9fc2b93b fate: get samples location from env var if not explicitly set
Use the FATE_SAMPLES environment variable if samples location
is not set with the --samples configure option or on the make
command line.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit aa3805a486)
2011-02-28 00:34:38 +01:00
Reimar Döffinger
52b3cc6047 configure: document FATE_SAMPLES env var in --help text
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-26 12:52:13 +00:00
Mans Rullgard
aa3805a486 fate: get samples location from env var if not explicitly set
Use the FATE_SAMPLES environment variable if samples location
is not set with the --samples configure option or on the make
command line.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-26 11:51:55 +00:00
Dave Yeo
f183cfeb99 OS/2: lxlite should use stdout
This causes lxlite to use stdout instead of vioXXX
functions. This improves fate and build logs readability.
Affects OS/2 only.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit cc4e9d2a24)
2011-02-26 03:16:06 +01:00
Dave Yeo
cc4e9d2a24 OS/2: lxlite should use stdout
This causes lxlite to use stdout instead of vioXXX
functions. This improves fate and build logs readability.
Affects OS/2 only.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-25 19:48:19 +00:00
Stefano Sabatini
bd8e750300 Port drawtext filter by Hemanth from the libavfilter soc repo, with
the following additions:
* support to anti-aliased glyph rendering
* support to UTF-8 text and Unicode chars rendering
* support for RGB packed formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-22 01:49:45 +01:00
Mans Rullgard
cdeba2de82 x86: check for AVX support
This adds configure and runtime checks for AVX support on x86 CPUs.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 87f1355f9b)
2011-02-20 19:05:47 +01:00
Mans Rullgard
87f1355f9b x86: check for AVX support
This adds configure and runtime checks for AVX support on x86 CPUs.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-20 13:20:42 +00:00
Reinhard Tartler
7ffe76e540 Merge libavcore into libavutil
Done to keep ABI compatible. Otherwise this is just silly
2011-02-16 23:00:30 +01:00
Reinhard Tartler
737eb5976f Merge libavcore into libavutil
It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody
is helped by having libavutil and libavcore split. In order to ease
maintenance inside and around FFmpeg and to reduce confusion where to
put common code, avcore's functionality is merged (back) to avutil.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-02-15 16:18:21 +01:00
Mans Rullgard
e0099fdaac configure: fix non-standard regex used with expr
The colon operator of expr always anchors the pattern at the start
of the string.  An explicit ^ in the pattern has unspecified
behaviour, so remove it.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 3ad464bfc7)
2011-02-14 23:58:20 +01:00
Mans Rullgard
48e0556739 configure: report full gcc version string
This makes the cc_ident value, which is used in FATE reports, include
all interesting parts of the gcc version string.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 5d57846bba)
2011-02-14 23:58:20 +01:00
Mans Rullgard
8429368d22 configure: add cleanws() function
This function removes leading and trailing spaces and collapses
multiple spaces into one.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit bb7a22b584)
2011-02-14 23:58:19 +01:00
Mans Rullgard
3ad464bfc7 configure: fix non-standard regex used with expr
The colon operator of expr always anchors the pattern at the start
of the string.  An explicit ^ in the pattern has unspecified
behaviour, so remove it.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-13 21:00:03 +00:00
Mans Rullgard
5d57846bba configure: report full gcc version string
This makes the cc_ident value, which is used in FATE reports, include
all interesting parts of the gcc version string.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-13 16:22:14 +00:00
Mans Rullgard
bb7a22b584 configure: add cleanws() function
This function removes leading and trailing spaces and collapses
multiple spaces into one.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-13 16:22:14 +00:00
Mans Rullgard
3ae4484cdf configure: remove early check_deps $ARCH_EXT_LIST
The early disabling of irrelevant arch extensions is no longer
required, and removing it makes dependencies involving these
work as expected.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4b884207eb)
2011-02-13 00:52:51 +01:00
Mans Rullgard
4b884207eb configure: remove early check_deps $ARCH_EXT_LIST
The early disabling of irrelevant arch extensions is no longer
required, and removing it makes dependencies involving these
work as expected.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-11 18:45:21 +00:00
François Revol
68b2336d13 Fix HOSTLIBS on Haiku
Haiku does not have a separate libm, so do not try to link to it.

Signed-off-by: François Revol <revol@free.fr>
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f59c4bd625)
2011-02-09 03:33:55 +01:00
Anssi Hannula
5fb06ffac7 configure: check yasm/nasm for working pextrd opcode
NASM versions older than 2.08 fail to build ffmpeg with several
"error: operation size not specified" errors but this is not caught in
configure.

Fix that by checking if "pextrd [eax], xmm0, 1" works in configure.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 48545a8f72)
2011-02-09 03:30:01 +01:00
François Revol
f59c4bd625 Fix HOSTLIBS on Haiku
Haiku does not have a separate libm, so do not try to link to it.

Signed-off-by: François Revol <revol@free.fr>
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-08 21:16:02 +00:00
Anssi Hannula
48545a8f72 configure: check yasm/nasm for working pextrd opcode
NASM versions older than 2.08 fail to build ffmpeg with several
"error: operation size not specified" errors but this is not caught in
configure.

Fix that by checking if "pextrd [eax], xmm0, 1" works in configure.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-06 11:43:35 -05:00
Mans Rullgard
9873463c2f Enable native build on QNX/x86
(cherry picked from commit d33ed7b367)
2011-01-31 18:25:40 +01:00
Mans Rullgard
d33ed7b367 Enable native build on QNX/x86 2011-01-30 01:05:39 +00:00
Mans Rullgard
744c166422 armcc: filter out non-gcc options from ASFLAGS
This allows passing armcc-specific flags with --extra-cflags without
choking the assembler.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d0f0f6287c)
2011-01-26 03:43:31 +01:00
Mans Rullgard
9c5c348eef configure: add filter_out() function
This adds a function to filter out words matching a pattern
from a list.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 9d201b2606)
2011-01-26 03:43:31 +01:00
Daniel Verkamp
121053b2d6 configure: move network tests before results are needed
This moves network_extralibs setup before use so that the link tests
for network functions work correctly.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 54fe299b88)
2011-01-26 03:43:30 +01:00
Mans Rullgard
a98ffb2bc8 Add CFLAGS needed by PathScale compiler
The PathScale compiler miscompiles wrapping arithmetic without
these flags.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 5f3b8314a4)
2011-01-26 03:43:28 +01:00
Mans Rullgard
355d05280a Disable symbol versioning on some BSDs
Dragonfly, NetBSD, and OpenBSD do not support symbol versioning
although our link test passes.  Disable it explicitly for these
systems.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit a1e4b3f6d3)
2011-01-26 03:43:28 +01:00