summaryrefslogtreecommitdiffstats
path: root/doc/ffmpeg.texi
Commit message (Collapse)AuthorAgeFilesLines
* doc: clarify -frames options behaviorLou Logan2014-11-041-3/+3
| | | | | | | | | 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-211-0/+6
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04'Michael Niedermayer2014-09-111-3/+3
|\ | | | | | | | | | | | | | | | | | | * 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-241-0/+3
| | | | | | | | -framerate.
* | doc/ffmpeg: fix metadata language exampleLou Logan2014-08-201-1/+1
| | | | | | | | Signed-off-by: Lou Logan <lou@lrcd.com>
* | doc: fix toolnameMichael Niedermayer2014-08-141-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '481a3667495425db9fdffb653292b6460fb68208'Michael Niedermayer2014-08-141-0/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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-301-4/+4
| | | | | | | | Also lowercase "options" in "Advanced Video Options" for consistency.
* | ffmpeg: support setting AVStream.discardMichael Niedermayer2014-06-071-0/+24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/ffmpeg: note that -t is also an input optionLou Logan2014-05-261-2/+7
| | | | | | | | Signed-off-by: Lou Logan <lou@lrcd.com>
* | Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'Michael Niedermayer2014-05-121-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '1839fafa951308237c4672ffd9a94f927b26eac7': avconv: Support VDA hwaccel Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'Michael Niedermayer2014-04-291-0/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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-031-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '006c253346d90f4abaf69d78083c8ba031628598'Michael Niedermayer2014-04-031-5/+10
|\ \ | |/ | | | | | | | | | | * 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-301-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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-241-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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-161-14/+25
| | | | | | | | | | | | | | 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-241-15/+12
| | | | | | | | | | | | timestamp options Avoid doc duplication and desynching.
* | doc/ffmpeg: remove documentation for removed vlang/slang optionsStefano Sabatini2014-01-081-5/+0
| |
* | doc/ffmpeg: use @command{} for programs mentioned in -override_ffserverStefano Sabatini2013-11-271-5/+7
| |
* | Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'Michael Niedermayer2013-11-231-0/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * 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-231-0/+27
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * 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-171-1/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc: make x11grab examples consistent with option namesLou Logan2013-10-141-2/+2
| | | | | | | | | | | | | | 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-101-1/+1
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '205a4502d3da9de2db75d2c965c9d065574e9266'Michael Niedermayer2013-08-111-5/+4
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-101-1/+1
| | | | | | | | | | | | | | | | 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-061-3/+15
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * 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-091-0/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '481575d255195c6c2f32e04686b94de984ae78d4'Michael Niedermayer2013-05-081-4/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-251-1/+24
| | | | | | | | | | | | | | | | | | | | 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-181-0/+4
| |
* | doc: enable compilation of -all tool pagesStefano Sabatini2013-04-051-0/+16
| | | | | | | | | | | | | | In particular, add documentation configuration system, through the doc/config.texi file. Fix trac issue #2374.
* | doc: Grammar fixes for stream selectionDerek Buitenhuis2013-03-311-6/+6
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | doc: Consistently use 'filtergraph'Derek Buitenhuis2013-03-311-13/+13
| | | | | | | | | | | | | | | | | | 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>
* | doc: Grammar fixes for FFmpeg's detailed descriptionDerek Buitenhuis2013-03-311-7/+7
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | doc: Consistently use 'frame rate' everywhereDerek Buitenhuis2013-03-311-1/+1
| | | | | | | | | | | | We used to use 'framerate' or 'frame rate' randomly. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | doc: Grammar fixes for FFmpeg descriptionDerek Buitenhuis2013-03-311-10/+10
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | doc: Fix grammar in -n descriptionDerek Buitenhuis2013-03-311-1/+2
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | doc: Small grammar fix in -f descriptionDerek Buitenhuis2013-03-311-1/+1
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c'Michael Niedermayer2013-03-281-0/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | doc/ffmpeg,ffmpeg-formats: avoid to mention ffmpeg options from formats.texiStefano Sabatini2013-03-191-1/+11
| | | | | | | | | | | | Also extends documentation for timestamp related ffmpeg options, in order to make more apparent the fact that muxer processing may change the timestamps values.
* | ffmpeg: make -lavfi an alias for -filter_complex.Nicolas George2013-03-171-0/+7
| |
* | ffmpeg: add the -canvas_size option.Nicolas George2013-03-101-0/+3
| | | | | | | | | | | | | | | | 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.
* | doc/ffplay,ffmpeg: mention the corresponding negated option for -statsStefano Sabatini2013-03-101-1/+2
| | | | | | | | | | | | | | | | | | 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.
* | Improve dump_attachment documentation.Carl Eugen Hoyos2013-02-281-2/+2
| | | | | | | | Fixes ticket #2299
* | ffmpeg_opt: add -to option to specify stop timeJean First2013-02-271-0/+8
| | | | | | | | | | Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc: fix reference to ffmpeg-bitstream-filters.html pageStefano Sabatini2013-02-151-1/+1
| |
* | doc: replace '×' symbol with 'x'Stefano Sabatini2013-02-061-1/+1
| | | | | | | | | | | | | | | | 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.
* | ffmpeg: remove -crop* and -pad* optionsStefano Sabatini2013-01-271-15/+0
| | | | | | | | | | The options have been deprecated and are non-operational since more than two years.
OpenPOWER on IntegriCloud