summaryrefslogtreecommitdiff
path: root/doc/ffmpeg.texi
Commit message (Collapse)AuthorAge
* ffmpeg.c: Add output file index and stream index to vstats file.Sasi Inguva2017-01-27
| | | | | Signed-off-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg_opt.c: Introduce a -vstats_version option and document the existing ↵Sasi Inguva2017-01-25
| | | | | | | -vstats format. Signed-off-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Avoid using the term "file" and prefer "url" in some docs and commentsMichael Niedermayer2016-12-05
| | | | | | This should make it less ambigous that these are URLs Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* doc/ffmpeg: add documentation for the disposition optionSimon Thelen2016-11-14
| | | | | Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: parameters for filter thread countsDeHackEd2016-11-06
| | | | | | Enables specifying how many threads are available to each filtergraph. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* doc: fix various typos and grammar errorsMoritz Barsnick2016-10-11
| | | | | Signed-off-by: Moritz Barsnick <barsnick@gmx.net> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit '398f015f077c6a2406deffd9e37ff34b9c7bb3bc'Hendrik Leppkes2016-10-08
|\ | | | | | | | | | | | | * commit '398f015f077c6a2406deffd9e37ff34b9c7bb3bc': avconv: buffer the packets written while the muxer is not initialized Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* | doc: Mention -dn in the "Stream selection" paragraph.Carl Eugen Hoyos2016-09-27
| | | | | | | | | | There is no "Data options" paragraph. Requested-by: ilker tezcan
* | Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | * commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
* | doc/ffmpeg: explain properly how -fs worksUmair Khan2016-02-01
| | | | | | | | | | | | Fix trac ticket #5160. Signed-off-by: Umair Khan <omerjerk@gmail.com>
* | ffmpeg_opt: Allow -metadata option to set metadata on programs.Vittorio Gambaletta (VittGam)2016-01-26
| | | | | | | | | | Signed-off-by: Vittorio Gambaletta <ffmpeg-dev@vittgam.net> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: Allow specifying the program number for created programsMichael Niedermayer2015-12-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: Add basic support to mux multiple programsMichael Niedermayer2015-12-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | doc/ffmpeg: Clarify that the sdp_file option requires an rtp output.Simon Thelen2015-11-09
| | | | | | | | | | Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'cd0e08813a0484002b5defbf557c859f123953ae'Hendrik Leppkes2015-10-29
|\| | | | | | | | | | | | | * commit 'cd0e08813a0484002b5defbf557c859f123953ae': avconv: support infinite loop for the loop option Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* | ffmpeg: add abort_on option to allow aborting on empty outputMarton Balint2015-10-22
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* | Merge commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8'Hendrik Leppkes2015-10-22
|\| | | | | | | | | | | | | * commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8': avconv: add support for Intel QSV-accelerated transcoding Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* | doc/ffmpeg: use stream_loop instead of loopGanesh Ajjanagadde2015-10-14
| | | | | | | | | | | | | | Commit dbb03b8e47f905f0f7b10c3eb5ac11f9bfc793ff renamed loop to stream_loop. This documents the change. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | Merge commit '16b0c929621f84983b83b9735ce973acb12723bc'Hendrik Leppkes2015-10-14
|\| | | | | | | | | | | | | * commit '16b0c929621f84983b83b9735ce973acb12723bc': avconv: Add loop option. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* | ffmpeg_opt: Add -hwaccels option that lists all supported hwaccelsTimothy Gu2015-08-26
| |
* | doc/ffmpeg,doc/ffplay: reference timespec definitionsGanesh Ajjanagadde2015-08-12
| | | | | | | | | | | | | | | | | | Reference time definition syntax in option descriptions when appropriate. Fixes trac ticket #4595. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | doc/ffmpeg: correct minor typoGanesh Ajjanagadde2015-08-11
| | | | | | | | | | Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | doc/ffmpeg: Use @codeMichael Niedermayer2015-07-29
| | | | | | | | | | Found-by: ubitux Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: Implement support for seeking relative to EOFMichael Niedermayer2015-07-29
| | | | | | | | | | | | Fixes Ticket227 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | doc/ffmpeg: remove tipsLou Logan2015-06-10
| | | | | | | | | | | | Ancient and misleading. Signed-off-by: Lou Logan <lou@lrcd.com>
* | doc/ffmpeg: Document xerrorMichael Niedermayer2015-05-30
| | | | | | | | | | Previous version reviewed-by: Lou Logan <lou@lrcd.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/ffmpeg: basic documentation for -copy/ignore_unknownMichael Niedermayer2015-05-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2'Michael Niedermayer2015-05-02
|\| | | | | | | | | | | | | | | | | | | | | * commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2': avconv: Add an option for automatically rotating video according to display matrix Conflicts: Changelog ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: add option not to offset seek position by start timewm42015-04-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Use @verbatim instead of @example for ASCII artsTimothy Gu2015-04-11
| | | | | | | | | | | | Partially fixes #3869. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix option name in documentationGiorgio Vazzana2015-03-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc: Improve video creation examples (from image2).Carl Eugen Hoyos2015-03-09
| | | | | | | | | | The examples used to drop frames in most cases which was probably not what users expected.
* | ffmpeg: allow to set the thread message queue size.Nicolas George2015-02-26
| |
* | doc: set documentencoding on toplevel texi files.Nicolas George2015-02-19
| | | | | | | | | | | | Fix double UTF-8 encoding on output files. makeinfo / texi2any does not seem to provide a way of setting it globally for toplevel files.
* | doc/ffmpeg: Document frame_drop_thresholdMichael Niedermayer2015-02-10
| |
* | doc/ffmpeg: mention both ffpreset/avpreset in documentation, remove ↵Werner Robitza2015-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | superfluous example ffmpeg looks for both .ffpreset and .avpreset files depending on whether the -[avsf]pre or -pre option is used. Added two sections for each type of preset including the rules according to which files are searched. (Notably, the lookup order is swapped for avpreset files, because it first looks for <codec>_<arg>.avpreset and then for <arg>.avpreset.) This removes the section explaining -pre only, which was under "Examples", where it did not really make sense. Signed-off-by: Werner Robitza <werner.robitza@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/ffmpeg.texi: document the new -sdp_file optionSimon Thelen2014-12-28
| | | | | | | | | | Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc: clarify -frames options behaviorLou Logan2014-11-04
| | | | | | | | | | | | | | | | | | 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>
* | doc/ffmpeg.texi: document the new -start_at_zero optionRodger Combs2014-10-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04'Michael Niedermayer2014-09-11
|\| | | | | | | | | | | | | | | | | | | * commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04': doc: Fix syntax and logical errors in avconv stream combination example Conflicts: doc/ffmpeg.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/ffmpeg: Try to clarify that the input option -r is not the same as ↵Carl Eugen Hoyos2014-08-24
| | | | | | | | -framerate.
* | doc/ffmpeg: fix metadata language exampleLou Logan2014-08-20
| | | | | | | | Signed-off-by: Lou Logan <lou@lrcd.com>
* | doc: fix toolnameMichael Niedermayer2014-08-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '481a3667495425db9fdffb653292b6460fb68208'Michael Niedermayer2014-08-14
|\| | | | | | | | | | | | | | | | | | | | | * commit '481a3667495425db9fdffb653292b6460fb68208': cmdutils: allow matching by metadata in stream specifiers Conflicts: Changelog cmdutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | doc: remove trailing ':' at the end of sectionsClément Bœsch2014-06-30
| | | | | | | | Also lowercase "options" in "Advanced Video Options" for consistency.
* | ffmpeg: support setting AVStream.discardMichael Niedermayer2014-06-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/ffmpeg: note that -t is also an input optionLou Logan2014-05-26
| | | | | | | | Signed-off-by: Lou Logan <lou@lrcd.com>
* | Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'Michael Niedermayer2014-05-12
|\| | | | | | | | | | | | | | | | | | | * commit '1839fafa951308237c4672ffd9a94f927b26eac7': avconv: Support VDA hwaccel Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'Michael Niedermayer2014-04-29
|\| | | | | | | | | | | | | | | | | | | | | * commit '35177ba77ff60a8b8839783f57e44bcc4214507a': avconv: add support for DXVA2 decoding Conflicts: Makefile configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/ffmpeg: restore ascii arrows in Simple filtergraphsMichael Niedermayer2014-04-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>