summaryrefslogtreecommitdiff
path: root/doc/ffmpeg.texi
Commit message (Collapse)AuthorAge
...
* | 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>
* | Merge commit '006c253346d90f4abaf69d78083c8ba031628598'Michael Niedermayer2014-04-03
|\| | | | | | | | | | | | | * commit '006c253346d90f4abaf69d78083c8ba031628598': doc: Fit the graph in 80 cols Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-30
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: make the ASCII flow charts narrower to fit onto TTY Conflicts: doc/ffmpeg.texi See: 8fe107609437909ddd2cf8f5690fe0158a0616f2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '746dca483a2f0f2639265f6e1c0085c8861875a1'Michael Niedermayer2014-02-24
|\| | | | | | | | | | | | | | | | | | | | | * commit '746dca483a2f0f2639265f6e1c0085c8861875a1': avconv: support forcing codec tags for input streams Conflicts: doc/ffmpeg.texi See: 6bca574a98ba604459f6ee92538b19d25bba0973 Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/ffmpeg: make the ASCII flow charts narrower to fit onto TTYTimothy Gu2014-02-16
| | | | | | | | | | | | | | These charts in man page are currently destroyed. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/ffmpeg: reference time syntax sections in ffmpeg-utils for itsoffset and ↵Stefano Sabatini2014-01-24
| | | | | | | | | | | | timestamp options Avoid doc duplication and desynching.
* | doc/ffmpeg: remove documentation for removed vlang/slang optionsStefano Sabatini2014-01-08
| |
* | doc/ffmpeg: use @command{} for programs mentioned in -override_ffserverStefano Sabatini2013-11-27
| |
* | Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'Michael Niedermayer2013-11-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea': avconv: add support for VDPAU decoding Conflicts: Changelog Makefile configure ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '07fd0a22192805d56c635eb294dc26b0a54ae325'Michael Niedermayer2013-11-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | doc/ffmpeg: document qscale and video stream special caseMichael Niedermayer2013-11-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc: make x11grab examples consistent with option namesLou Logan2013-10-14
| | | | | | | | | | | | | | 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>
* | doc: Rename avtools-common-opts to fftools-common optsTimothy Gu2013-09-10
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '205a4502d3da9de2db75d2c965c9d065574e9266'Michael Niedermayer2013-08-11
|\| | | | | | | | | | | | | | | | | | | * commit '205a4502d3da9de2db75d2c965c9d065574e9266': doc: Clarify the avconv section about -re Conflicts: doc/ffmpeg.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | doc: apply various grammar fixesBryce W. Harrington2013-08-10
| | | | | | | | | | | | | | | | 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>
* | Merge commit '811bd0784679dfcb4ed02043a37c92f9df10500e'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | doc/ffmpeg: document -override_ffserverMichael Niedermayer2013-07-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '481575d255195c6c2f32e04686b94de984ae78d4'Michael Niedermayer2013-05-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | doc: remove all-components.texi, include its content verbatimStefano Sabatini2013-04-25
| | | | | | | | | | | | | | | | | | | | 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.
* | ffmpeg: make -aspect work with -vcodec copy.Nicolas George2013-04-18
| |
* | doc: enable compilation of -all tool pagesStefano Sabatini2013-04-05
| | | | | | | | | | | | | | In particular, add documentation configuration system, through the doc/config.texi file. Fix trac issue #2374.