Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc/ffmpeg.texi
AgeCommit message (Collapse)Author
2014-09-20Merge commit '40c7613ecf2f3f7565309f9780183228605c3684' into release/2.2Michael Niedermayer
* commit '40c7613ecf2f3f7565309f9780183228605c3684': doc: Fix syntax and logical errors in avconv stream combination example Conflicts: doc/ffmpeg.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-24Merge commit '746dca483a2f0f2639265f6e1c0085c8861875a1'Michael Niedermayer
* commit '746dca483a2f0f2639265f6e1c0085c8861875a1': avconv: support forcing codec tags for input streams Conflicts: doc/ffmpeg.texi See: 6bca574a98ba604459f6ee92538b19d25bba0973 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-16doc/ffmpeg: make the ASCII flow charts narrower to fit onto TTYTimothy Gu
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-01-24doc/ffmpeg: reference time syntax sections in ffmpeg-utils for itsoffset and ↵Stefano Sabatini
timestamp options Avoid doc duplication and desynching.
2014-01-08doc/ffmpeg: remove documentation for removed vlang/slang optionsStefano Sabatini
2013-11-27doc/ffmpeg: use @command{} for programs mentioned in -override_ffserverStefano Sabatini
2013-11-23Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'Michael Niedermayer
* commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea': avconv: add support for VDPAU decoding Conflicts: Changelog Makefile configure ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-23Merge commit '07fd0a22192805d56c635eb294dc26b0a54ae325'Michael Niedermayer
* 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-17doc/ffmpeg: document qscale and video stream special caseMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-15doc: make x11grab examples consistent with option namesLou Logan
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-09-10doc: Rename avtools-common-opts to fftools-common optsTimothy Gu
Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-11Merge commit '205a4502d3da9de2db75d2c965c9d065574e9266'Michael Niedermayer
* commit '205a4502d3da9de2db75d2c965c9d065574e9266': doc: Clarify the avconv section about -re Conflicts: doc/ffmpeg.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-10doc: apply various grammar fixesBryce W. Harrington
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-06Merge commit '811bd0784679dfcb4ed02043a37c92f9df10500e'Michael Niedermayer
* 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-07-10doc/ffmpeg: document -override_ffserverMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08Merge commit '481575d255195c6c2f32e04686b94de984ae78d4'Michael Niedermayer
* 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-04-25doc: remove all-components.texi, include its content verbatimStefano Sabatini
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-19ffmpeg: make -aspect work with -vcodec copy.Nicolas George
2013-04-05doc: enable compilation of -all tool pagesStefano Sabatini
In particular, add documentation configuration system, through the doc/config.texi file. Fix trac issue #2374.
2013-04-01doc: Grammar fixes for stream selectionDerek Buitenhuis
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-04-01doc: Consistently use 'filtergraph'Derek Buitenhuis
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-04-01doc: Grammar fixes for FFmpeg's detailed descriptionDerek Buitenhuis
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-04-01doc: Consistently use 'frame rate' everywhereDerek Buitenhuis
We used to use 'framerate' or 'frame rate' randomly. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-04-01doc: Grammar fixes for FFmpeg descriptionDerek Buitenhuis
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-04-01doc: Fix grammar in -n descriptionDerek Buitenhuis
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-04-01doc: Small grammar fix in -f descriptionDerek Buitenhuis
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-03-28Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c'Michael Niedermayer
* 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-19doc/ffmpeg,ffmpeg-formats: avoid to mention ffmpeg options from formats.texiStefano Sabatini
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-17ffmpeg: make -lavfi an alias for -filter_complex.Nicolas George
2013-03-10ffmpeg: add the -canvas_size option.Nicolas George
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-10doc/ffplay,ffmpeg: mention the corresponding negated option for -statsStefano Sabatini
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-02-28Improve dump_attachment documentation.Carl Eugen Hoyos
Fixes ticket #2299
2013-02-27ffmpeg_opt: add -to option to specify stop timeJean First
Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-15doc: fix reference to ffmpeg-bitstream-filters.html pageStefano Sabatini
2013-02-07doc: replace '×' symbol with 'x'Stefano Sabatini
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-01-27ffmpeg: remove -crop* and -pad* optionsStefano Sabatini
The options have been deprecated and are non-operational since more than two years.
2013-01-27ffmpeg: implement -force_key_frames expression evalutionStefano Sabatini
2013-01-26ffmpeg: add -guess_layout_max option.Nicolas George
2013-01-19ffmpeg: accept "chapters" as forced key frames.Nicolas George
Allow to force a key frame at the beginning of each chapter.
2013-01-15Fix color filter example.Carl Eugen Hoyos
Found-by: johnd and Paul B Mahol
2013-01-13doc/ffmpeg: extend documentation for the -filter options and -af/vf aliasesStefano Sabatini
2012-12-21doc: remove inclusion of libav* documentation in toolsStefano Sabatini
This shrinks the tool manuals to a manageable size. Relevant manuals are referenced in the "See Also" chapter. Overall documentation inclusion should still be possible through the use of a conditional variable set during configuration time, if someone feels the need for a huge-wall-of-text-fashioned manual.
2012-12-19doc: extend "See Also" chapter rendering for ff* toolsStefano Sabatini
Add more references, and generate alternative variants for HTML and POD output. In particular, this allows to render a "See Also" chapter in the HTML output.
2012-12-19doc: rework synopsis section for ff* toolsStefano Sabatini
Fix syntax, remove pointless introductory sentence, improve overall consistency.
2012-12-19doc: use a common authors.texi file blurbStefano Sabatini
Factorize.
2012-12-18Fix "bistream" typo and add a check in tools/patcheck.Clément Bœsch
2012-12-18doc: remove references to external documentsStefano Sabatini
Fix a few warnings generated when creating the manuals. Our current doc generation toolchain does not allow to reference external documents.
2012-12-14docs: -asyncts has been replaced by aresample not asyncts in ffmpegMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-12Fix frame-rate documentation.Carl Eugen Hoyos
2012-12-12doc/ffmpeg: fix/extend documentation for -copytsStefano Sabatini
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-08 00:18:33 +0300