Commit Graph

175 Commits

Author SHA1 Message Date
Lou Logan
37425fcb04 doc: clarify -frames options behavior
Replace "frames to record" with "frames to output". The "to record"
makes it seem like an input option, or that it would capture the frames
instead of outputting them.

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Lou Logan <lou@lrcd.com>
2014-11-04 16:25:47 -09:00
Rodger Combs
1372c55786 doc/ffmpeg.texi: document the new -start_at_zero option
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-21 13:38:44 +02:00
Michael Niedermayer
5e3da25618 Merge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04'
* commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04':
  doc: Fix syntax and logical errors in avconv stream combination example

Conflicts:
	doc/ffmpeg.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-11 01:27:38 +02:00
Carl Eugen Hoyos
6f78c70324 doc/ffmpeg: Try to clarify that the input option -r is not the same as -framerate. 2014-08-24 02:49:06 +02:00
Lou Logan
d2163f5e28 doc/ffmpeg: fix metadata language example
Signed-off-by: Lou Logan <lou@lrcd.com>
2014-08-20 10:44:22 -08:00
Michael Niedermayer
082d52354f doc: fix toolname
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-14 01:00:49 +02:00
Michael Niedermayer
b8e4c11d93 Merge commit '481a3667495425db9fdffb653292b6460fb68208'
* commit '481a3667495425db9fdffb653292b6460fb68208':
  cmdutils: allow matching by metadata in stream specifiers

Conflicts:
	Changelog
	cmdutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-14 00:41:21 +02:00
Clément Bœsch
ec94c52e97 doc: remove trailing ':' at the end of sections
Also lowercase "options" in "Advanced Video Options" for consistency.
2014-06-30 15:36:26 +02:00
Michael Niedermayer
01ef127bf8 ffmpeg: support setting AVStream.discard
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-07 21:26:22 +02:00
Lou Logan
5b1a56b34b doc/ffmpeg: note that -t is also an input option
Signed-off-by: Lou Logan <lou@lrcd.com>
2014-05-26 12:11:34 -08:00
Michael Niedermayer
5460ab73d2 Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'
* commit '1839fafa951308237c4672ffd9a94f927b26eac7':
  avconv: Support VDA hwaccel

Conflicts:
	Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-12 02:44:28 +02:00
Michael Niedermayer
c6eee3120a Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'
* commit '35177ba77ff60a8b8839783f57e44bcc4214507a':
  avconv: add support for DXVA2 decoding

Conflicts:
	Makefile
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29 01:22:22 +02:00
Michael Niedermayer
4169d8f601 doc/ffmpeg: restore ascii arrows in Simple filtergraphs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-03 19:25:15 +02:00
Michael Niedermayer
0768fee964 Merge commit '006c253346d90f4abaf69d78083c8ba031628598'
* commit '006c253346d90f4abaf69d78083c8ba031628598':
  doc: Fit the graph in 80 cols

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-03 19:25:03 +02:00
Michael Niedermayer
9c77e57393 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avconv: make the ASCII flow charts narrower to fit onto TTY

Conflicts:
	doc/ffmpeg.texi

See: 8fe1076094
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-30 21:20:58 +02:00
Michael Niedermayer
cc6cc84bc4 Merge commit '746dca483a2f0f2639265f6e1c0085c8861875a1'
* commit '746dca483a2f0f2639265f6e1c0085c8861875a1':
  avconv: support forcing codec tags for input streams

Conflicts:
	doc/ffmpeg.texi

See: 6bca574a98
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-24 09:15:46 +01:00
Timothy Gu
8fe1076094 doc/ffmpeg: make the ASCII flow charts narrower to fit onto TTY
These charts in man page are currently destroyed.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-16 03:10:38 +01:00
Stefano Sabatini
433b153b68 doc/ffmpeg: reference time syntax sections in ffmpeg-utils for itsoffset and timestamp options
Avoid doc duplication and desynching.
2014-01-24 12:20:46 +01:00
Stefano Sabatini
e9edf001d4 doc/ffmpeg: remove documentation for removed vlang/slang options 2014-01-08 09:47:53 +01:00
Stefano Sabatini
6b58488f92 doc/ffmpeg: use @command{} for programs mentioned in -override_ffserver 2013-11-27 15:48:19 +01:00
Michael Niedermayer
3e641b4842 Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'
* commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea':
  avconv: add support for VDPAU decoding

Conflicts:
	Changelog
	Makefile
	configure
	ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-23 14:46:48 +01:00
Michael Niedermayer
62e10c3759 Merge commit '07fd0a22192805d56c635eb294dc26b0a54ae325'
* commit '07fd0a22192805d56c635eb294dc26b0a54ae325':
  avconv: add infrastructure for using hwaccels

Conflicts:
	ffmpeg.c
	ffmpeg.h
	ffmpeg_filter.c
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-23 14:31:15 +01:00
Michael Niedermayer
74a8fe9483 doc/ffmpeg: document qscale and video stream special case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-17 16:08:06 +01:00
Lou Logan
a06dcde507 doc: make x11grab examples consistent with option names
Change -r to -framerate, but either will work.
Change -s to -video_size, but either will work.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-10-14 23:08:52 +02:00
Timothy Gu
83165e39fe doc: Rename avtools-common-opts to fftools-common opts
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-10 18:04:03 +02:00
Michael Niedermayer
99091ff217 Merge commit '205a4502d3da9de2db75d2c965c9d065574e9266'
* commit '205a4502d3da9de2db75d2c965c9d065574e9266':
  doc: Clarify the avconv section about -re

Conflicts:
	doc/ffmpeg.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-11 11:49:47 +02:00
Bryce W. Harrington
d9c46c3cd9 doc: apply various grammar fixes
The first sentence of each of the modified man pages are worded a bit
awkwardly. These minor copy-edits should make them clearer.

Signed-off-by: Bryce Harrington <b.harrington@samsung.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-08-10 10:07:30 +02:00
Michael Niedermayer
7cbef2ed7e Merge commit '811bd0784679dfcb4ed02043a37c92f9df10500e'
* commit '811bd0784679dfcb4ed02043a37c92f9df10500e':
  avconv: make input -ss accurate when transcoding

Conflicts:
	Changelog
	doc/ffmpeg.texi
	ffmpeg.h
	ffmpeg_filter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06 11:39:09 +02:00
Michael Niedermayer
e9be4675b8 doc/ffmpeg: document -override_ffserver
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 22:19:10 +02:00
Michael Niedermayer
42f5fc716e Merge commit '481575d255195c6c2f32e04686b94de984ae78d4'
* commit '481575d255195c6c2f32e04686b94de984ae78d4':
  avconv: remove -deinterlace

Conflicts:
	Changelog
	doc/ffmpeg.texi
	ffmpeg.c
	ffmpeg_opt.c

The merge removes the documentation for the deprecated -deinterlace
the code itself has already been replaced a while ago by code
that inserts yadif, that insertion code is left in place.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 12:07:56 +02:00
Stefano Sabatini
f40cf96ec0 doc: remove all-components.texi, include its content verbatim
Force re-generation of the manuals when an included file is modified.
The current dependency generation system is enable to track nested
inclusions.

The drawback is that the files will be generated even when there is no
strict need (for example if filters.texi is modified, ffmpeg.1 is
rebuilt), thus it trades a false negative with a false positive.
2013-04-25 11:19:53 +02:00
Nicolas George
b1cc12d0e3 ffmpeg: make -aspect work with -vcodec copy. 2013-04-18 22:59:54 +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
Derek Buitenhuis
a034cdf49d doc: Grammar fixes for stream selection
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:09 -04:00
Derek Buitenhuis
9db706206d doc: Consistently use 'filtergraph'
We used to use 'filtergraph' or 'filter graph' randomly.

'filtergraph' was chosen due to having 57 occurrences in
the documentation, whereas 'filter graph' had only 19.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:08 -04:00
Derek Buitenhuis
9249b28e79 doc: Grammar fixes for FFmpeg's detailed description
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:08 -04:00
Derek Buitenhuis
fe64b88950 doc: Consistently use 'frame rate' everywhere
We used to use 'framerate' or 'frame rate' randomly.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:08 -04:00
Derek Buitenhuis
91b5ee6699 doc: Grammar fixes for FFmpeg description
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:08 -04:00
Derek Buitenhuis
9f597052d4 doc: Fix grammar in -n description
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:08 -04:00
Derek Buitenhuis
876fe11e32 doc: Small grammar fix in -f description
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-31 18:22:08 -04:00
Michael Niedermayer
ac1a1fd708 Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c'
* commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c':
  lavfi/gradfun: remove rounding to match C and SSE code.
  lavfi/gradfun: fix dithering in MMX code.
  lavfi/gradfun: fix rounding in MMX code.
  lavfi/gradfun: do not increment DC pointer for odd values.
  fate: filter: Add dependencies
  avconv: add options for reading filtergraphs from a file.

Conflicts:
	Changelog
	doc/ffmpeg.texi
	doc/filters.texi
	ffmpeg.h
	ffmpeg_opt.c
	libavfilter/vf_gradfun.c
	tests/fate/filter.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 13:00:39 +01:00
Stefano Sabatini
18f43de964 doc/ffmpeg,ffmpeg-formats: avoid to mention ffmpeg options from formats.texi
Also extends documentation for timestamp related ffmpeg options, in order
to make more apparent the fact that muxer processing may change the
timestamps values.
2013-03-19 17:31:16 +01:00
Nicolas George
40ea006b76 ffmpeg: make -lavfi an alias for -filter_complex. 2013-03-17 16:24:43 +01:00
Nicolas George
cb2bd91413 ffmpeg: add the -canvas_size option.
Allows, amongst other things, to override the size guessed
by the sub2video hack.

Note: the -s option could have more or less the same semantic,
but it receives a special treatment by the options system.
2013-03-10 13:48:49 +01:00
Stefano Sabatini
f185a040b0 doc/ffplay,ffmpeg: mention the corresponding negated option for -stats
This helps lazy users who didn't read the part about boolean options, in
case they grep for "-nostats".

-stdin and -stats are the only booleans option enabled by default. This
is a partial fix for Trac ticket #2332, a complete overhaul of boolean
options documentation is probably overkill.
2013-03-10 13:22:59 +01:00
Carl Eugen Hoyos
a791b62f5f Improve dump_attachment documentation.
Fixes ticket #2299
2013-02-28 08:57:10 +01:00
Jean First
2d7044683f ffmpeg_opt: add -to option to specify stop time
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-27 02:17:42 +01:00
Stefano Sabatini
0018221c03 doc: fix reference to ffmpeg-bitstream-filters.html page 2013-02-15 18:56:27 +01:00
Stefano Sabatini
d11ac64ecf doc: replace '×' symbol with 'x'
Non-ascii chars are not correctly rendered in both MAN and HTML output or
may even cause compilation failure. Thus avoid to use them until we find
a satisfying way to deal with them.

Fix trac ticket #2243.
2013-02-06 22:55:36 +01:00
Stefano Sabatini
27db2bf000 ffmpeg: remove -crop* and -pad* options
The options have been deprecated and are non-operational since more than
two years.
2013-01-27 16:56:47 +01:00