1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Commit Graph

529 Commits

Author SHA1 Message Date
Diego Biurrun
ad0e31f134 build: prettyprinting cosmetics 2012-03-26 13:00:10 +02:00
Anton Khirnov
0d0b81f941 Generate manpages for AV{Format,Codec}Context AVOptions. 2012-03-20 07:10:06 +01:00
Diego Biurrun
b315042c8c Remove libpostproc.
This library does not fit into Libav as a whole and its code is just a
maintenance burden.  Furthermore it is now available as an external project,
which completely obviates any reason to keep it around.

URL: http://git.videolan.org/?p=libpostproc.git
2012-02-23 19:36:16 +01:00
Diego Biurrun
58fc740059 build: Drop YASM-OBJS-FFT from SUBDIR_VARS.
FFT code only appears in libavcodec, so there is no need to reset the variable
when the build templates are instantiated for other libraries.
2012-02-03 14:53:21 +01:00
Diego Biurrun
7f2885bbb7 build: Drop unused X86-OBJS variable. 2012-02-03 14:53:20 +01:00
Diego Biurrun
07a873a277 build: Automatically include architecture-specific library Makefile snippets. 2012-01-25 15:04:28 +01:00
Anton Khirnov
0fec2cb15c Remove ffmpeg. 2012-01-23 21:04:29 +01:00
Diego Biurrun
144904e901 build: rename subdir.mak ---> library.mak 2011-12-13 23:34:22 +01:00
Mans Rullgard
878dda5db1 build: move inclusion of subdir.mak to main subdir loop
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-12-13 14:26:49 +00:00
Janne Grunau
8096fdf0b6 presets: rename presets directory 2011-10-19 21:20:17 +02:00
Anton Khirnov
df3ca34a56 Makefile: change presets extension to .avpreset
Fixes make install.
2011-10-19 07:50:12 +02:00
Dave Yeo
cc73511e8e Fix NASM include directive
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-08-15 11:24:35 -07:00
Anton Khirnov
6291d7e416 Make a copy of ffmpeg under a new name -- avconv.
It will be further developed with a few incompatible changes.

ffmpeg.c will stay as is for some time, so any scripts using it won't be
broken.
2011-08-12 13:27:30 +02:00
Anton Khirnov
4d58e4cb4c Rename ffserver to avserver. 2011-08-09 19:56:25 +02:00
Anton Khirnov
9e12f0bf5f Rename ffprobe to avprobe. 2011-08-09 19:56:24 +02:00
Anton Khirnov
266463daff Rename ffplay to avplay. 2011-08-09 19:56:21 +02:00
Mans Rullgard
371584c42b build: add -L flags before existing LDFLAGS
This ensures the linker picks the just built libraries even
if LDFLAGS for some reason contains -L flags pointing at
other directories containing libav libraries.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-21 12:50:31 +01:00
Mans Rullgard
1fef92fd73 build: remove unnecessary dependency on libs from 'all' target
The libs are added to the all target elsewhere, no need to do it
again here.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-11 21:08:52 +01:00
Mans Rullgard
ca9036155d build: remove unnecessary FFLDFLAGS variable
This variable is set to the same value for all directories.
Adding the -L flags directly to LDFLAGS is simpler and achieves
the same thing.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-11 11:39:04 +01:00
Mans Rullgard
28e1c97916 build: rework rules for things in the tools dir
Declaring tools associated with each library in their respective
makefiles allows these tools to easily depend on the correct
prerequisites and link against the libs they need.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-10 21:13:38 +01:00
Diego Biurrun
db54be09c2 build: Remove deleted 'check' target from .PHONY list. 2011-07-04 13:14:31 +02:00
Diego Biurrun
bd9a9a2f18 build: Eliminate obsolete test targets.
The targets are now part of FATE and can be run as individual FATE targets.
2011-06-30 13:06:27 +02:00
Mans Rullgard
f68069868b build: fix creation of tools dir with make 3.81
GNU make 3.81 apparently does not support order-only prerequisites
with pattern rules, and thus fails to create the tools directory
if it is missing.  Naming the objects explicitly in the rule makes
it work properly.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-29 12:06:46 +01:00
Diego Biurrun
e2542dcc6e build: Mark all-yes Makefile target as phony. 2011-06-29 12:15:52 +02:00
Mans Rullgard
5e27ec28f0 build: create output directories as needed
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-29 09:14:56 +01:00
Mans Rullgard
57b4a3dd2b build: include sub-makefiles using full path instead of symlinks
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-28 18:15:19 +01:00
Mans Rullgard
bc877faf7f build: factor out the .c and .S compile commands as a macro
These commands have the same form, and using a common macro allows
it to be used elsewhere without further duplication.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-26 23:07:40 +01:00
Mans Rullgard
f038cf3c74 build: remove SRC_PATH_BARE variable
Setting SRC_PATH to "." when building in-tree removes the need
for a quoted version of the source path since out-of-tree builds
are not possible if the pathname contains spaces.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-23 12:17:25 +01:00
Mans Rullgard
bb5249244d build: move basic rules and variables to main Makefile
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-23 12:17:08 +01:00
Mans Rullgard
8d853efe53 build: move special targets to end of main Makefile
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-23 12:16:53 +01:00
Mans Rullgard
f87b03b50d build: move documentation rules to doc/Makefile
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-22 22:59:46 +01:00
Mans Rullgard
698a183e30 build: move test rules to tests/Makefile
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-22 22:53:07 +01:00
Mans Rullgard
d530e57944 build: move vpath directives to main Makefile
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-14 19:53:53 +01:00
Mans Rullgard
cf53c48615 build: move ALLFFLIBS to a more logical place
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-14 10:59:56 +01:00
Mans Rullgard
151c584188 build: fix "make install" with documentation disabled
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-11 20:35:53 +01:00
Mans Rullgard
623ffe8c82 build: simplify some conditional targets
Use intermediate targets instead of variables for conditional
parts of "all" and "install" targets.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-11 19:35:47 +01:00
Mans Rullgard
6d170962bd build: make rule for linking ff* apply only to these targets
This ensures that the special link command using cmdutils.o
only applies to the targets it should.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-07 01:28:15 +01:00
Mans Rullgard
d93d7349ce build: rearrange some lines in a more logical way
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-06 23:21:12 +01:00
Mans Rullgard
0018b7f043 build: clean up .PHONY lists
This removes nonexisting targets from phony lists and puts them
all in one place.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-06 16:56:53 +01:00
Mans Rullgard
d7a72d250b build: move all (un)install* target aliases to toplevel Makefile
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-06 16:56:53 +01:00
Diego Biurrun
a5514a8474 build: Simplify texi2html invocation through the --output option.
The --output option is available in texi2html since at least version 1.78.
2011-06-03 15:43:05 +02:00
Mans Rullgard
798b264678 build: remove BUILD_ROOT variable
This variable is unnecessary as absolute paths are not required.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-29 12:36:16 +01:00
Diego Biurrun
59748689f6 build: Remove generated .version file on distclean. 2011-05-26 16:26:18 +02:00
Mans Rullgard
f907ad9b85 Remove unused make variable SEEK_REFFILE
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-18 20:21:27 +01:00
Mans Rullgard
164c24c858 fate: remove redundant aref and vref references
The ref targets are included in the FATE_[AV]CODEC lists created
by configure so they do not need to be listed separately in the
makefile.  Filter them out when setting dependencies to avoid make
warnings about circular deps.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-18 19:24:35 +01:00
Mans Rullgard
70378ea190 fate: run aref and vref as regular tests
These tests create reference files used for psnr calculation in
the other codec tests.  Treating them as (mostly) regular tests
simplifies the makefile and makes them visible in the fate reports.
The latter makes errors in these runs easier to identify.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-18 14:45:46 +01:00
Reinhard Tartler
8ce67bcabe Implement fate-rsync target 2011-05-03 19:21:30 +02:00
Ronald S. Bultje
3283f274fd FATE: allow forcing thread-type when doing threaded fate runs.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-04-21 19:36:45 -04:00
Martin Storsjö
f83acb096c Makefile: Include dependencies for test tools, too
This makes seek_test to be rebuilt when its dependencies
has changed. The changes to the dependencies didn't usually matter
in practice, but the introduction of side data in AVPacket required
a recompilation.

Signed-off-by: Martin Storsjö <martin@martin.st>
2011-04-20 21:44:04 +03:00
Mans Rullgard
e0be794a71 Remove support for stripping executables
Stripping is generally best left to package management tools, and
since unstripped copies are kept in the build tree, any arguments
about saving space (no matter how insignificant) are void.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-29 22:05:04 +01:00
Luca Barbato
7851eb68c6 fate: add support for multithread testing
Add a THREADS variable to fate calls.
2011-03-23 01:17:20 +01:00
Janne Grunau
faa6f1c306 get rid of the last svn mentions 2011-03-18 21:57:38 +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
Mans Rullgard
08df7f8666 Makefile: include deps from tools directory
This ensures the tools are rebuilt when necessary.  Specifically,
lavfi-showfiltfmts was sometimes not rebuilt causing spurious test
failures.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-20 18:04:52 +00: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
Stefano Sabatini
40321376d8 Allow "make clean" to clean files in tools
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-12 12:58:10 +00:00
Stefano Sabatini
cd6a5a57b8 Add lavfi-showfiltfmts and graph2dot to $(TOOLS)
Allow make clean to remove the corresponding binaries.

Fix issue 2162.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-12 12:55:31 +00:00
Mans Rullgard
a7878c9f73 VP8: ARM optimised decode_block_coeffs_internal
Approximately 5% faster on Cortex-A8.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-11 15:48:11 +00:00
Mans Rullgard
f3619680a7 Makefile: remove unused variable ALLHTMLPAGES
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-01 12:33:13 +00:00
Mans Rullgard
7f939f55bb Makefile: build docs only for enabled tools; fix docs dependencies
This makes "make documentation" build the man/html pages only for
the tools enabled in the build.  It also fixes the dependency
tracking for the built man pages.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-01 12:33:09 +00:00
Mans Rullgard
a0f9c8ce37 Auto-generate dependencies for documentation
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-01 00:10:00 +00:00
Janne Grunau
a8f0814a74 doc: modify style for texi2html 1.78+
The generated HTML files are similar to the ones generated with
texi2html 1.56k used on the website.

Tested with texi2html 1.78 and 5.0. 1.78 is the minimal recommended
version.

The removed @sp from the titlepage section were ignored until
texi2html 5.0. If not removed the pages generated by 5.0 will have ugly
empty space around the title.
2011-01-29 16:57:29 +01:00
Mans Rullgard
3d157bf31f Makefile: fix cleaning of tools in tests directory
The variable TESTPROGS is reset by the library makefiles,
use another name.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-25 13:43:54 +00:00
Daniel Verkamp
3adbe49f2b Fix ALLPROGS_G so that *_g binaries get cleaned properly
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-25 12:46:10 +00:00
Mans Rullgard
2b39962eb6 Makefile: simplify test tools handling
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-23 13:55:35 +00:00
Mans Rullgard
583fcb528c Makefile: simplify setting of some variables
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-21 15:36:05 +00:00
Stefano Sabatini
ef298ea7ac Add demuxers.texi file.
Originally committed as revision 26282 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-09 10:22:21 +00:00
Anton Khirnov
a46515115c Metadata muxer
Dumps all metadata to a text file for easy manual editing.

Originally committed as revision 26101 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-27 07:46:49 +00:00
Stefano Sabatini
8399d23517 Add dependency for the libavfitler.html file.
Originally committed as revision 26078 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-23 17:06:46 +00:00
Stefano Sabatini
82ccbe6b27 Simplify texi files naming: ff*-doc.texi -> ff*.texi.
Originally committed as revision 26006 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-14 18:38:37 +00:00
Stefano Sabatini
fe858d7bd1 Define PODPAGES in Makefile, and make them depend on
fftools-common-opts.texi.

Fix pod files updating when fftools-common-opts.texi is changed.

Originally committed as revision 25928 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-11 12:00:41 +00:00
Ramiro Polla
4d1156cb2c Fix building of object files in tools/
Fixes issue issue2408.

Originally committed as revision 25905 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-07 11:42:19 +00:00
Stefano Sabatini
361d275879 Add a file for bitstream filters documentation.
Based on a patch by Nicolas George
<@var{name}.@var{surname}@@normalesup.@code{org}>.

Originally committed as revision 25709 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-08 14:27:16 +00:00
Stefano Sabatini
07851d7936 Add eval.texi file.
Originally committed as revision 25665 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-03 19:43:55 +00:00
Måns Rullgård
d29d9cccf8 fate: print list of tests with "make fate-list"
Originally committed as revision 24947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-26 13:58:45 +00:00
Vitor Sessak
680aefa2fe MP3 float decoder FATE tests
Originally committed as revision 24880 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-23 12:17:03 +00:00
Måns Rullgård
715e9be267 fate: remove pointless fate/fate2 separation
Originally committed as revision 24868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-22 14:24:58 +00:00
Diego Biurrun
3123823cb2 Skip adding SDL_CFLAGS to CFLAGS for the ffplay.d target.
We no longer create .d files directly, so the rule is pointless.

Originally committed as revision 24805 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-17 14:58:44 +00:00
Måns Rullgård
4c3fbd4f93 fate: move some groups of related tests to their own files
This moves some groups of tests for single codecs to separate files,
and adds shorthands for running all tests in a group.

Originally committed as revision 24697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-04 18:47:20 +00:00
Stefano Sabatini
43d2c6a511 Fix fate-lavfi-pixfmts test cross-compilation.
Add the lavfi-showfiltfmts dependency in the Makefile, and correctly
use the $target_exec and $target_path variables for invoking the
lavfi-showfiltfmts tool.

Originally committed as revision 24645 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 10:27:04 +00:00
Stefano Sabatini
1de4cfe635 Add protocols.texi.
Originally committed as revision 24616 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-31 15:45:29 +00:00
Stefano Sabatini
4419c8bf25 Add the indevs.texi and outdevs.texi files.
Originally committed as revision 24543 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-27 13:10:59 +00:00
Måns Rullgård
b82be63688 fate: create report files
Originally committed as revision 24529 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-26 23:44:06 +00:00
Måns Rullgård
ce3a841da1 Add a simple base64 encoder for use in tests
Originally committed as revision 24526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-26 23:43:56 +00:00
Måns Rullgård
9d0b304241 Do not automatically run configure
Making automatic reconfigure work properly in all cases proved more
difficult than it seemed, and people complained about it.  Instead,
print a warning when the configuration appears to be out of date.

Originally committed as revision 24436 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-22 17:47:56 +00:00
Stefano Sabatini
aac6ca6978 Add libavcore.
The new library is meant to contain the core multimedia utilities for
FFmpeg, to make them shareable between more libav* libraries.

See thread:
Subject: [FFmpeg-devel] [RFC] New library for shared non-generic libav* utils
Date: Fri, 9 Jul 2010 01:07:40 +0200

Originally committed as revision 24393 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-21 18:28:42 +00:00
Måns Rullgård
b3dce4b9bf Enable lavfi test in "make test"
Originally committed as revision 24382 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-21 10:06:24 +00:00
Måns Rullgård
86601915d2 Rerun configure when all*.c files have changed
Originally committed as revision 24370 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 18:10:27 +00:00
Måns Rullgård
f6ae77d469 Change message tag for tests to simply TEST
Originally committed as revision 24369 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 18:10:24 +00:00
Måns Rullgård
57f096309a Remove old regtest make rules redirecting to fate-based ones
Originally committed as revision 24348 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 10:19:31 +00:00
Måns Rullgård
9a3f31efcb fate: allow running regtests through fate frontend
Originally committed as revision 24347 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 10:19:28 +00:00
Måns Rullgård
48c281629a Generate list of lavfi tests in configure
Originally committed as revision 24329 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-19 17:17:43 +00:00
Måns Rullgård
2e204aeb1b fate: echo fate-run command with V=1
Originally committed as revision 24328 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-19 17:17:39 +00:00
Måns Rullgård
34ae2d90e0 Remove dead target from .PHONY list
Originally committed as revision 24151 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-09 23:37:19 +00:00
Måns Rullgård
7e264ca136 fate: add oneoff test for twinvq
Originally committed as revision 24135 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-09 00:40:55 +00:00
Måns Rullgård
aab3ea5f7d fate: add oneoff comparison method
This adds the 'oneoff' comparison method.  It compares two s16le pcm
files with a max difference <= the fuzz factor treated as success.
Default fuzz is 1.  On failure, the full tiny_psnr output is printed.

Originally committed as revision 24134 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-09 00:40:51 +00:00
Måns Rullgård
3ade7d32c1 fate: pass additional variables to test script
This passes the following additional variables to the test script:

- CMP  method to use comparing output with reference, default 'diff'
- REF  reference file, default 'tests/ref/fate/${test}'
- FUZZ maximum fuzz factor in comparison, meaning depends on CMP

Originally committed as revision 24133 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-09 00:40:45 +00:00
Måns Rullgård
f955d45226 Change names of regtest output files to closer match the reference files
Originally committed as revision 24127 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-08 22:10:14 +00:00
Måns Rullgård
9770a7ad0e Simplify regtest reference makefile dependencies
Originally committed as revision 24121 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-08 18:44:08 +00:00
Måns Rullgård
57442411d7 Move regression test dependencies to configure
This allows expressing complex dependencies more easily.

Originally committed as revision 24120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-08 18:44:06 +00:00