aboutsummaryrefslogtreecommitdiffstats
path: root/doc/ffmpeg.texi
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | ffmpeg: implement -force_key_frames expression evalutionStefano Sabatini2013-01-271-0/+38
| |
* | ffmpeg: add -guess_layout_max option.Nicolas George2013-01-261-0/+6
| |
* | ffmpeg: accept "chapters" as forced key frames.Nicolas George2013-01-191-1/+9
| | | | | | | | Allow to force a key frame at the beginning of each chapter.
* | Fix color filter example.Carl Eugen Hoyos2013-01-151-1/+1
| | | | | | | | Found-by: johnd and Paul B Mahol
* | doc/ffmpeg: extend documentation for the -filter options and -af/vf aliasesStefano Sabatini2013-01-131-12/+21
| |
* | doc: remove inclusion of libav* documentation in toolsStefano Sabatini2012-12-201-13/+0
| | | | | | | | | | | | | | | | | | 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.
* | doc: extend "See Also" chapter rendering for ff* toolsStefano Sabatini2012-12-191-4/+22
| | | | | | | | | | | | 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.
* | doc: rework synopsis section for ff* toolsStefano Sabatini2012-12-191-7/+1
| | | | | | | | | | Fix syntax, remove pointless introductory sentence, improve overall consistency.
* | doc: use a common authors.texi file blurbStefano Sabatini2012-12-191-4/+2
| | | | | | | | Factorize.
* | Fix "bistream" typo and add a check in tools/patcheck.Clément Bœsch2012-12-181-1/+1
| |
* | doc: remove references to external documentsStefano Sabatini2012-12-171-1/+2
| | | | | | | | | | | | | | Fix a few warnings generated when creating the manuals. Our current doc generation toolchain does not allow to reference external documents.
* | docs: -asyncts has been replaced by aresample not asyncts in ffmpegMichael Niedermayer2012-12-131-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix frame-rate documentation.Carl Eugen Hoyos2012-12-121-2/+1
| |
* | doc/ffmpeg: fix/extend documentation for -copytsStefano Sabatini2012-12-121-1/+9
| |
* | doc: fix a -map syntax in one command line example.Clément Bœsch2012-12-111-1/+1
| |
* | doc/ffmpeg: remove -debug option descriptionStefano Sabatini2012-11-031-33/+1
| | | | | | | | The option belongs to libavcodec, so it results duplicated in the file.
* | docu: fix flite examplerogerdpack2012-10-151-1/+1
| | | | | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
* | Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2'Michael Niedermayer2012-10-101-5/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2': avconv: remove -same_quant Conflicts: Changelog doc/faq.texi ffmpeg.c ffmpeg.h ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'Michael Niedermayer2012-08-311-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5': x86: Fix linking with some or all of yasm, mmx, optimizations disabled configure: Add more fine-grained SSE CPU capabilities flags avfilter: x86: Use more precise compile template names x86: cosmetics: Comment some #endifs for better readability g723_1: add comfort noise generation utvideoenc: Switch to dsputils' median prediction utvideoenc: Avoid writing into the input picture avtools: remove the distinction between func_arg and func2_arg. avconv: make the -passlogfile option per-stream. avconv: make the -pass option per-stream. cmdutils: make -codecs print lossy/lossless flags. lavc: add lossy/lossless codec properties. Conflicts: Changelog cmdutils.c configure doc/APIchanges ffmpeg.h ffmpeg_opt.c ffprobe.c libavcodec/codec_desc.c libavcodec/g723_1.c libavcodec/utvideoenc.c libavcodec/version.h libavcodec/x86/mpegaudiodec.c libavcodec/x86/rv40dsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/ffmpeg: extend documentation for -(no)stdin optionStefano Sabatini2012-08-211-4/+6
| | | | | | | | Fix trac ticket #1665.
* | Merge commit '7c5012127fb7e18f0616011257bb4248f6a8b608'Michael Niedermayer2012-08-201-7/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '7c5012127fb7e18f0616011257bb4248f6a8b608': cmdutils: change semantics of show_help_options() and document it. avtools: move some newlines to show_help_options(). avconv: deprecate -isync. Conflicts: ffmpeg_opt.c ffserver.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-181-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegvideo_enc: don't use deprecated avcodec_encode_video(). cmdutils: refactor -codecs option. avconv: make -shortest a per-output file option. lavc: add avcodec_descriptor_get_by_name(). lavc: add const to AVCodec* function parameters. swf(dec): replace CODEC_ID with AV_CODEC_ID dvenc: don't use deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE rtmpdh: Do not generate the same private key every time when using libnettle rtp: remove ff_rtp_get_rtcp_file_handle(). rtsp.c: use ffurl_get_multi_file_handle() instead of ff_rtp_get_rtcp_file_handle() avio: add (ff)url_get_multi_file_handle() for getting more than one fd h264: vdpau: fix crash with unsupported colorspace amrwbdec: Decode the fr_quality bit properly Conflicts: Changelog cmdutils.c cmdutils_common_opts.h doc/ffmpeg.texi ffmpeg.c ffmpeg.h ffmpeg_opt.c libavcodec/h264.c libavcodec/options.c libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: add an option to fix subtitles durations.Nicolas George2012-08-141-0/+19
| | | | | | | | With this option, transcoding DVB subtitles becomes possible.
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 07:33:25 +0000