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
58,514 Commits 37 Branches 400 Tags 460 MiB
a8ac2a1530
Commit Graph

91 Commits

Author SHA1 Message Date
Michael Niedermayer
715f3623f8 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Add an audio transcoding example.

Conflicts:
	configure
	doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-27 10:31:08 +01:00
Andreas Unterweger
10421bcf0a Add an audio transcoding example. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-27 09:20:05 +01:00
Michael Niedermayer
5b326f398e doc/Makefile: fix building examples if a program suffix is set 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-27 02:23:55 +01:00
Michael Niedermayer
875f9aea3e Merge commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c' 
* commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c':
  Makefile: Fix building programs on systems with a nonempty executable suffix

Conflicts:
	Makefile

See: f1db007e00
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-27 02:09:16 +01:00
Diego Biurrun
92f0abb27f build: Check for pod2man instead of perl for manual page generation 
Some systems provide Perl without pod2man.
 2013-11-26 13:49:06 -08:00
Michael Niedermayer
f1db007e00 doc/Makefile fix PROGS 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-26 02:06:59 +01:00
Michael Niedermayer
6d34aa245d Merge commit 'ab81f24ad43bddf77ddd25cba86780c1c884996c' 
* commit 'ab81f24ad43bddf77ddd25cba86780c1c884996c':
  build: Integrate multilibrary examples into the build system

Conflicts:
	configure
	doc/Makefile
	doc/examples/muxing.c
	doc/examples/output.c
	libavformat/Makefile
	libavformat/output-example.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-26 01:31:00 +01:00
Michael Niedermayer
5ded4332f1 Merge commit '14abeaa43d021afdce9119d906891abe89c03b88' 
* commit '14abeaa43d021afdce9119d906891abe89c03b88':
  build: Separate building programs linking against libav* from building av*

Conflicts:
	Makefile
	doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-26 01:12:24 +01:00
Diego Biurrun
ab81f24ad4 build: Integrate multilibrary examples into the build system 
This includes moving libavformat/output-example to doc/examples/output.
 2013-11-25 11:57:29 -08:00
Diego Biurrun
14abeaa43d build: Separate building programs linking against libav* from building av* 
This will allow cleaner integration of building example programs.
 2013-11-25 11:57:29 -08:00
Martin Storsjö
09cd0a3176 doc: Add the host executable suffix for the print_options dependency 
This fixes building on windows.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-11-25 11:20:55 +02:00
James Almer
eff2edae56 Partially revert "Merge commit 'f187557ab4612776f7f527ecf3d40062975c3e4c'" 
This partially reverts commit c0237d19a0
Some scripts make use of --disable-doc

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-25 01:53:12 +01:00
Michael Niedermayer
c0237d19a0 Merge commit 'f187557ab4612776f7f527ecf3d40062975c3e4c' 
* commit 'f187557ab4612776f7f527ecf3d40062975c3e4c':
  build: more fine-grained dependencies for documentation build tools

Conflicts:
	configure
	doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-24 04:55:35 +01:00
Diego Biurrun
f187557ab4 build: more fine-grained dependencies for documentation build tools 
Perl is needed to build the manual pages, texi2html for the HTML pages.
 2013-11-23 09:45:06 -08:00
Stefano Sabatini
af1c538850 doc/Makefile: fix man pages uninstall path 
Fix trac ticket #3054.
 2013-10-24 21:19:52 +02:00
James Almer
e3d34100e7 doc: add *install-doc that covers all documentation 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-08 05:25:17 +02:00
James Almer
1e97ae4ba3 doc: rename *install-doc to *install-html 
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-07 21:41:43 +02:00
James Almer
2df184f3d5 doc: fix install-doc dependencies 
Put it inside its own ifdef conditional.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-07 21:41:43 +02:00
Michael Niedermayer
91acb23a28 doc: fix insane hard texi2html dependancy 
Found-by: nevcairiel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-01 20:02:52 +02:00
Michael Niedermayer
d8809b357c Merge commit 'f4ca970dba13a60a1334cce1b574036e6f624b9c' 
* commit 'f4ca970dba13a60a1334cce1b574036e6f624b9c':
  configure: Add docdir configuration option

Conflicts:
	configure
	doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-01 13:42:37 +02:00
Vittorio Giovara
f4ca970dba configure: Add docdir configuration option 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-08-31 16:16:38 +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
Stefano Sabatini
be3f4c13b6 doc/Makefile: install .3 man pages to man3 subdir 
Fix trac ticket #2585.
 2013-05-19 19:26:25 +02:00
Stefano Sabatini
90cb081f88 build: drop unused ALLMANPAGES variable 2013-05-19 19:26:21 +02:00
Stefano Sabatini
9b4d9d8795 doc: enable compilation of -all tool pages 
In particular, add documentation configuration system, through the
doc/config.texi file.

Fix trac issue #2374.
 2013-04-05 10:11:57 +02:00
Michael Niedermayer
70b0aeba00 Merge commit '7a95afe433b2a692f490b98948c082e62ffc1d27' 
* commit '7a95afe433b2a692f490b98948c082e62ffc1d27':
  doc: fix dependencies in pod generation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-24 14:35:15 +01:00
Luca Barbato
7a95afe433 doc: fix dependencies in pod generation 
The script can and will change.
 2013-01-24 10:43:15 +01:00
James Almer
4f8b73129b doc/Makefile: Fix make docclean 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-19 14:32:29 +01:00
Clément Bœsch
00ebac6dfd doc: stop generating syntax.html. 
Just like doc/eval.texi, this file is meant to be included from
ffmpeg-utils.texi, and not to be used as a standalone documentation.
 2012-12-24 00:53:55 +01:00
Stefano Sabatini
9bba683578 doc/Makefile: add docclean rule 
This allows to clean the doc directory from the parent project dir.
The command:
make -C doc clean

does not work as long as the paths specified in doc/Makefile are relative
to the parent dir.

Also it is consitent with "testclean" and "distclean" targets.
 2012-12-18 00:06:17 +01:00
Stefano Sabatini
cf56c20761 doc/Makefile: rework component configuration logic 
Only enable component manual when the corresponding library providing
the feature is enabled.
 2012-11-29 10:19:52 +01:00
Stefano Sabatini
5ddc072d0d doc: add ffmpeg-bitstream-filters.texi file 2012-11-28 23:51:12 +01:00
Stefano Sabatini
3a227f5d90 doc: add ffmpeg-protocols.texi manual 2012-11-27 23:35:45 +01:00
Stefano Sabatini
9c492271a8 doc: move syntax and eval chapters from libavutil to ffmpeg-utils 
Move utilities description to a dedicated manual, consistent with what I
did with the rest of the documentation.
 2012-11-27 23:35:35 +01:00
Stefano Sabatini
d82331721e doc: add libavdevice.texi and ffmpeg-devices.texi files 2012-11-27 23:35:25 +01:00
Stefano Sabatini
8ddeae5ae7 doc: add libavformat.texi and ffmpeg-formats.texi files 2012-11-27 23:35:19 +01:00
Stefano Sabatini
cf6c6134cd doc: add libswscale.texi and ffmpeg-scaler.texi files 2012-11-25 19:21:30 +01:00
Stefano Sabatini
e903cb4194 doc: add libswresample.texi and ffmpeg-resampler.texi files 2012-11-25 00:28:36 +01:00
Stefano Sabatini
f62abbf3b7 doc: move filters documentation to dedicated manual page ffmpeg-filters 2012-11-25 00:28:27 +01:00
Stefano Sabatini
fa4ead1d66 doc: move codec options and descriptions to a dedicated manual page 2012-11-25 00:27:07 +01:00
Stefano Sabatini
c0aff4064d doc/Makefile: generate library headers with the correct section number 2012-11-11 14:06:27 +01:00
Stefano Sabatini
514910fb2d doc: add libavfilter.texi 
With some re-wording by Alexander Strasser <eclipse7@gmx.net>.
 2012-11-11 11:15:53 +01:00
Stefano Sabatini
598546e1df doc: add libavutil.texi 
With some fixes and better wording by Alexander Strasser
<eclipse7@gmx.net>.
 2012-11-11 11:15:53 +01:00
Stefano Sabatini
58d1d7024d doc/Makefile: change DOCLIBS check 
More consistent with the rest of the build system, and more compact.
 2012-11-07 23:18:11 +01:00
Stefano Sabatini
a1934daeb4 doc/Makefile: remove .3 file with make clean 2012-11-06 12:23:13 +01:00
Stefano Sabatini
617d0d41a2 doc: add libavcodec.texi 
The option chapter is based on the avoptions_codec.texi auto-generated
file.
 2012-11-04 11:54:57 +01:00
Michael Niedermayer
2581d9bcbb Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc: add apidoc target for doxygen API documentation
  matroskadec: do not use avpacket internals

Conflicts:
	doc/Makefile
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-03 14:48:51 +01:00
Janne Grunau
b3fab1f2cd doc: add apidoc target for doxygen API documentation 
Documentation includes only the externally visible API of the installed
headers.

Based on a patch by Anton Khirnov <anton@khirnov.net>.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-11-02 18:28:56 +01:00
Michael Niedermayer
52dc18d414 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: vc1: call ff_vc1dsp_init_x86() under if (ARCH_X86)
  x86: cavs: call ff_cavsdsp_init_x86() under if (ARCH_X86)
  x86: call most of the x86 dsp init functions under if (ARCH_X86)
  doc: support the new website layout
  doc: remove a warning from filters.texi
  doc: initial nut documentation
  segment: drop global headers setting
  lavu: fix typo in Makefile

Conflicts:
	doc/Makefile
	doc/filters.texi
	doc/t2h.init
	libavcodec/fmtconvert.c
	libavcodec/proresdsp.c
	libavcodec/x86/Makefile
	libavcodec/x86/vc1dsp_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-08 21:46:34 +02:00